Skip to content

Commit db223f2

Browse files
committed
Use JCEF browser
1 parent 9f30fd8 commit db223f2

13 files changed

+507
-288
lines changed

flutter-idea/src/io/flutter/FlutterUtils.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,15 @@
3636
import com.intellij.util.PlatformUtils;
3737
import com.jetbrains.lang.dart.DartFileType;
3838
import com.jetbrains.lang.dart.psi.DartFile;
39+
import io.flutter.jxbrowser.EmbeddedJxBrowser;
40+
import io.flutter.jxbrowser.JxBrowserStatus;
3941
import io.flutter.pub.PubRoot;
4042
import io.flutter.pub.PubRootCache;
4143
import io.flutter.settings.FlutterSettings;
4244
import io.flutter.utils.AndroidUtils;
4345
import io.flutter.utils.FlutterModuleUtils;
46+
import io.flutter.view.EmbeddedBrowser;
47+
import io.flutter.view.EmbeddedJcefBrowser;
4448
import org.jetbrains.annotations.NotNull;
4549
import org.jetbrains.annotations.Nullable;
4650
import org.jetbrains.annotations.SystemIndependent;
@@ -622,4 +626,18 @@ private static ModuleSourceOrderEntry findModuleSourceEntry(@NotNull Module modu
622626
}
623627
return null;
624628
}
629+
630+
@Nullable
631+
public static EmbeddedBrowser embeddedBrowser(Project project) {
632+
if (project == null || project.isDisposed()) {
633+
return null;
634+
}
635+
636+
return FlutterSettings.getInstance().isEnableJcefBrowser() ? EmbeddedJcefBrowser.getInstance(project) : EmbeddedJxBrowser.getInstance(project);
637+
}
638+
639+
public static boolean embeddedBrowserAvailable(JxBrowserStatus status) {
640+
return status.equals(JxBrowserStatus.INSTALLED) || status.equals(JxBrowserStatus.INSTALLATION_SKIPPED) && FlutterSettings.getInstance()
641+
.isEnableJcefBrowser();
642+
}
625643
}

flutter-idea/src/io/flutter/jxbrowser/EmbeddedBrowser.java

Lines changed: 0 additions & 269 deletions
This file was deleted.

0 commit comments

Comments
 (0)