Make JX Browser the fallback and remove settings option (#7232)

This removes the option to select JCEF or JX Browser in settings for
simplicity. We will instead check if JCEF is available first, and if
not, download and use JX Browser. Embedded browser failures in IJ (where
JCEF is included by default) were very low, so I think it's unlikely
users will benefit from having a choice here.

I still need to build this to check whether this is detecting the
presence of JCEF accurately.

Author: helin24

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

@@ -633,11 +633,10 @@ public static EmbeddedBrowser embeddedBrowser(Project project) {
       return null;
     }
 
-    return FlutterSettings.getInstance().isEnableJcefBrowser() ? EmbeddedJcefBrowser.getInstance(project) : EmbeddedJxBrowser.getInstance(project);
+    return EmbeddedJcefBrowser.isUsable() ? EmbeddedJcefBrowser.getInstance(project) : EmbeddedJxBrowser.getInstance(project);
   }
 
   public static boolean embeddedBrowserAvailable(JxBrowserStatus status) {
-    return status.equals(JxBrowserStatus.INSTALLED) || status.equals(JxBrowserStatus.INSTALLATION_SKIPPED) && FlutterSettings.getInstance()
-      .isEnableJcefBrowser();
+    return status.equals(JxBrowserStatus.INSTALLED) || status.equals(JxBrowserStatus.INSTALLATION_SKIPPED) && EmbeddedJcefBrowser.isUsable();
   }
 }

flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.form

@@ -244,7 +244,7 @@
           </grid>
         </children>
       </grid>
-      <grid id="23e52" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="23e52" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -287,15 +287,6 @@
               <toolTipText resource-bundle="io/flutter/FlutterBundle" key="settings.show.all.configs.tooltip"/>
             </properties>
           </component>
-          <component id="909bb" class="javax.swing.JCheckBox" binding="myEnableJcefBrowserCheckBox">
-            <constraints>
-              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="io/flutter/FlutterBundle" key="settings.jcef.browser"/>
-              <toolTipText resource-bundle="io/flutter/FlutterBundle" key="settings.jcef.browser.tooltip"/>
-            </properties>
-          </component>
         </children>
       </grid>
       <grid id="3bf2f" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">

flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.java

@@ -78,8 +78,6 @@ public class FlutterSettingsConfigurable implements SearchableConfigurable {
 
   private JCheckBox myShowAllRunConfigurationsInContextCheckBox;
 
-  private JCheckBox myEnableJcefBrowserCheckBox;
-
   private JCheckBox myShowBuildMethodGuides;
   private JCheckBox myShowClosingLabels;
   private FixedSizeButton myCopyButton;
@@ -267,10 +265,6 @@ public boolean isModified() {
       return true;
     }
 
-    if (settings.isEnableJcefBrowser() != myEnableJcefBrowserCheckBox.isSelected()) {
-      return true;
-    }
-
     return false;
   }
 
@@ -329,7 +323,6 @@ public void apply() throws ConfigurationException {
     settings.setAllowTestsInSourcesRoot(myAllowTestsInSourcesRoot.isSelected());
     settings.setShowAllRunConfigurationsInContext(myShowAllRunConfigurationsInContextCheckBox.isSelected());
     settings.setFontPackages(myFontPackagesTextArea.getText());
-    settings.setEnableJcefBrowser(myEnableJcefBrowserCheckBox.isSelected());
 
     reset(); // because we rely on remembering initial state
     checkFontPackages(settings.getFontPackages(), oldFontPackages);
@@ -401,7 +394,6 @@ public void reset() {
     myIncludeAllStackTraces.setEnabled(myShowStructuredErrors.isSelected());
 
     myShowAllRunConfigurationsInContextCheckBox.setSelected(settings.showAllRunConfigurationsInContext());
-    myEnableJcefBrowserCheckBox.setSelected(settings.isEnableJcefBrowser());
     myFontPackagesTextArea.setText(settings.getFontPackages());
   }
 

flutter-idea/src/io/flutter/settings/FlutterSettings.java

@@ -30,7 +30,6 @@ public class FlutterSettings {
   private static final String enableHotUiKey = "io.flutter.editor.enableHotUi";
   private static final String enableBazelHotRestartKey = "io.flutter.editor.enableBazelHotRestart";
   private static final String showBazelHotRestartWarningKey = "io.flutter.showBazelHotRestartWarning";
-  private static final String enableJcefBrowserKey = "io.flutter.enableJcefBrowser";
   private static final String fontPackagesKey = "io.flutter.fontPackages";
   private static final String allowTestsInSourcesRootKey = "io.flutter.allowTestsInSources";
   private static final String showBazelIosRunNotificationKey = "io.flutter.hideBazelIosRunNotification";
@@ -265,16 +264,6 @@ public void setShowAllRunConfigurationsInContext(boolean value) {
     fireEvent();
   }
 
-  public boolean isEnableJcefBrowser() {
-    return getPropertiesComponent().getBoolean(enableJcefBrowserKey, false);
-  }
-
-  public void setEnableJcefBrowser(boolean value) {
-    getPropertiesComponent().setValue(enableJcefBrowserKey, value, false);
-
-    fireEvent();
-  }
-
   public boolean isVerboseLogging() {
     return getPropertiesComponent().getBoolean(verboseLoggingKey, false);
   }

flutter-idea/src/io/flutter/utils/JxBrowserUtils.java

@@ -7,6 +7,7 @@
 
 import com.intellij.openapi.util.SystemInfo;
 import io.flutter.settings.FlutterSettings;
+import io.flutter.view.EmbeddedJcefBrowser;
 import org.jetbrains.annotations.NotNull;
 // import com.intellij.util.system.CpuArch;
 
@@ -88,6 +89,6 @@ public boolean licenseIsSet() {
 
 
   public boolean skipInstallation() {
-    return FlutterSettings.getInstance().isEnableJcefBrowser();
+    return EmbeddedJcefBrowser.isUsable();
   }
 }

flutter-idea/src/io/flutter/view/EmbeddedJcefBrowser.java

@@ -42,6 +42,7 @@ public JComponent getTabComponent(ContentManager contentManager) {
 
 public class EmbeddedJcefBrowser extends EmbeddedBrowser {
   private static final Logger LOG = Logger.getInstance(JxBrowserManager.class);
+  private static Boolean jcefIsUsable = null;
 
   public EmbeddedJcefBrowser(Project project) {
     super(project);
@@ -52,6 +53,20 @@ public static EmbeddedJcefBrowser getInstance(Project project) {
     return ServiceManager.getService(project, EmbeddedJcefBrowser.class);
   }
 
+  public static boolean isUsable() {
+    if (jcefIsUsable != null) return jcefIsUsable;
+
+    try {
+      new JBCefBrowser();
+    }
+    catch (IllegalStateException e) {
+      jcefIsUsable = false;
+      return false;
+    }
+    jcefIsUsable = true;
+    return true;
+  }
+
   public Logger logger() {
     return LOG;
   }

flutter-idea/src/io/flutter/view/FlutterView.java

@@ -768,7 +768,7 @@ private void debugActiveHelper(FlutterApp app, @Nullable InspectorService inspec
   }
 
   private void displayEmbeddedBrowser(FlutterApp app, InspectorService inspectorService, ToolWindow toolWindow, DevToolsIdeFeature ideFeature) {
-    if (FlutterSettings.getInstance().isEnableJcefBrowser()) {
+    if (EmbeddedJcefBrowser.isUsable()) {
       presentDevTools(app, inspectorService, toolWindow, true, ideFeature);
     } else {
       displayEmbeddedBrowserIfJxBrowser(app, inspectorService, toolWindow, ideFeature);