Add JCEF option

Author: helin24

flutter-idea/src/io/flutter/FlutterBundle.properties

@@ -213,6 +213,8 @@ settings.allow.tests.tooltip=The directory must be marked as a sources root, suc
 settings.font.packages=Font Packages
 settings.show.all.configs=Show all possible run configurations for apps or tests, even if a created configuration already exists
 settings.show.all.configs.tooltip=If there is a defined run configuration to watch a specific test and one to just run it, show both.
+settings.jcef.browser=Use JCEF browser to show embedded DevTools.
+settings.jcef.browser.tooltip=JCEF is a browser included in IntelliJ that is an alternative to using JxBrowser for showing embedded DevTools.
 settings.enable.androi.gradle.sync.tooltip=Provides advanced editing capabilities for Java and Kotlin code. Uses Gradle to find Android libraries then links them into the Flutter project.
 settings.experiments=Experiments
 settings.editor=Editor

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

@@ -236,7 +236,7 @@
           </grid>
         </children>
       </grid>
-      <grid id="23e52" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="23e52" layout-manager="GridLayoutManager" row-count="5" 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"/>
@@ -279,6 +279,15 @@
               <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

@@ -31,8 +31,6 @@
 import com.intellij.ui.components.ActionLink;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.labels.LinkLabel;
-import com.intellij.uiDesigner.core.GridConstraints;
-import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.util.PlatformIcons;
 import icons.FlutterIcons;
 import io.flutter.*;
@@ -49,7 +47,6 @@
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.text.JTextComponent;
-import java.awt.*;
 import java.awt.datatransfer.StringSelection;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -81,6 +78,8 @@ public class FlutterSettingsConfigurable implements SearchableConfigurable {
 
   private JCheckBox myShowAllRunConfigurationsInContextCheckBox;
 
+  private JCheckBox myEnableJcefBrowserCheckBox;
+
   private JCheckBox myShowBuildMethodGuides;
   private JCheckBox myShowClosingLabels;
   private FixedSizeButton myCopyButton;
@@ -263,6 +262,10 @@ public boolean isModified() {
       return true;
     }
 
+    if (settings.isEnableJcefBrowser() != myEnableJcefBrowserCheckBox.isSelected()) {
+      return true;
+    }
+
     return false;
   }
 
@@ -320,6 +323,7 @@ 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);
@@ -390,6 +394,7 @@ 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

@@ -32,6 +32,7 @@ public class FlutterSettings {
   private static final String enableEmbeddedBrowsersKey = "io.flutter.editor.enableEmbeddedBrowsers";
   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";
@@ -257,6 +258,16 @@ 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);
   }