Bug 1604158 - Hide the encoding detector submenu in hamburger/toolbar cases when chardetng is enabled. r=emk

Differential Revision: https://phabricator.services.mozilla.com/D57305

--HG--
extra : moz-landing-system : lando

browser/components/customizableui/CustomizableWidgets.jsm

@@ -452,6 +452,15 @@ const CustomizableWidgets = [
       } catch (e) {}
 
       this._updateElements(detectorContainer.children, currentDetector);
+      let hideDetector = Services.prefs.getBoolPref(
+        "intl.charset.detector.ng.enabled"
+      );
+      aDocument.getElementById(
+        "PanelUI-characterEncodingView-autodetect-container"
+      ).hidden = hideDetector;
+      aDocument.getElementById(
+        "PanelUI-characterEncodingView-autodetect-separator"
+      ).hidden = hideDetector;
     },
     _updateElements(aElements, aCurrentItem) {
       if (!aElements.length) {

browser/components/customizableui/content/panelUI.inc.xhtml

@@ -664,8 +664,8 @@
         <toolbarseparator/>
         <vbox id="PanelUI-characterEncodingView-charsets"
               class="PanelUI-characterEncodingView-list"/>
-        <toolbarseparator/>
-        <vbox>
+        <toolbarseparator id="PanelUI-characterEncodingView-autodetect-separator"/>
+        <vbox id="PanelUI-characterEncodingView-autodetect-container">
           <label id="PanelUI-characterEncodingView-autodetect-label"/>
           <vbox id="PanelUI-characterEncodingView-autodetect"
                 class="PanelUI-characterEncodingView-list"/>