Port Bug 1598557 (again) - Move all BrowserToolbox files to a dedicated folder; rs=bustage-fix DONTBUILD
authorGeoff Lankow <geoff@darktrojan.net>
Thu, 28 Nov 2019 14:03:46 +1300
changeset 37617 8f5ec78422e09c3b87a69e0777d98b52048f0899
parent 37616 44a47f85aade5ac888d0215c28d193fcb68b95fd
child 37618 34d97d986759ddbc6b3d8c6745e0bae88ba59506
push id396
push userclokep@gmail.com
push dateMon, 06 Jan 2020 23:11:57 +0000
reviewersbustage-fix
bugs1598557
Port Bug 1598557 (again) - Move all BrowserToolbox files to a dedicated folder; rs=bustage-fix DONTBUILD
mail/base/content/mailWindowOverlay.js
mail/base/content/mainKeySet.inc.xul
mail/base/content/mainNavigationToolbox.inc.xul
mail/components/customizableui/content/panelUI.inc.xul
mail/components/devtools/devtools-loader.jsm
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -36,17 +36,17 @@ var { AppConstants } = ChromeUtils.impor
 var { AddonManager } = ChromeUtils.import(
   "resource://gre/modules/AddonManager.jsm"
 );
 var { TagUtils } = ChromeUtils.import("resource:///modules/TagUtils.jsm");
 var { MessageArchiver } = ChromeUtils.import(
   "resource:///modules/MessageArchiver.jsm"
 );
 
-var { BrowserToolboxProcess } = ChromeUtils.import(
+var { BrowserToolboxLauncher } = ChromeUtils.import(
   "resource://devtools/client/framework/browser-toolbox/Launcher.jsm"
 );
 var { ExtensionParent } = ChromeUtils.import(
   "resource://gre/modules/ExtensionParent.jsm"
 );
 var { ExtensionSupport } = ChromeUtils.import(
   "resource:///modules/ExtensionSupport.jsm"
 );
--- a/mail/base/content/mainKeySet.inc.xul
+++ b/mail/base/content/mainKeySet.inc.xul
@@ -176,17 +176,17 @@
        modifiers="accel,shift"/>
   <key id="key_devtoolsToolbox"
        key="&devToolboxCmd.commandkey;"
 #ifdef XP_MACOSX
        modifiers="accel,alt"
 #else
        modifiers="accel,shift"
 #endif
-       oncommand="BrowserToolboxProcess.init();"/>
+       oncommand="BrowserToolboxLauncher.init();"/>
   <key id="key_scratchpad"
        keycode="&scratchpadCmd.keycode;"
        keytext="&scratchpadCmd.keytext;"
        modifiers="shift"
        oncommand="ScratchpadManager.openScratchpad({ executionContext: 2 });"/>
   <key id="key_sanitizeHistory"
        keycode="VK_DELETE"
        oncommand="toSanitize();"
--- a/mail/base/content/mainNavigationToolbox.inc.xul
+++ b/mail/base/content/mainNavigationToolbox.inc.xul
@@ -1013,17 +1013,17 @@
                   oncommand="BondOpenPGP.openKeyManager(window)"/>
 #endif
         <menu id="devtoolsMenu" label="&devtoolsMenu.label;" accesskey="&devtoolsMenu.accesskey;">
           <menupopup id="devtoolsPopup">
             <menuitem id="devtoolsToolbox"
                       label="&devToolboxCmd.label;"
                       accesskey="&devToolboxCmd.accesskey;"
                       key="key_devtoolsToolbox"
-                      oncommand="BrowserToolboxProcess.init();"/>
+                      oncommand="BrowserToolboxLauncher.init();"/>
             <menuitem id="addonDebugging"
                       label="&debugAddonsCmd.label;"
                       accesskey="&debugAddonsCmd.accesskey;"
                       oncommand="openAboutDebugging('addons')"/>
             <menuitem id="tabsDebugging"
                       label="&tabsDebugCmd.label;"
                       accesskey="&tabsDebugCmd.accesskey;"
                       oncommand="openAboutDebugging('tabs')"/>
--- a/mail/components/customizableui/content/panelUI.inc.xul
+++ b/mail/components/customizableui/content/panelUI.inc.xul
@@ -1652,17 +1652,17 @@
                title="&devtoolsMenu.label;"
                class="PanelUI-subView">
       <vbox class="panel-subview-body">
         <toolbarbutton id="appmenu_devtoolsToolbox"
                        class="subviewbutton subviewbutton-iconic"
                        label="&devToolboxCmd.label;"
                        accesskey="&devToolboxCmd.accesskey;"
                        key="key_devtoolsToolbox"
-                       oncommand="BrowserToolboxProcess.init();"/>
+                       oncommand="BrowserToolboxLauncher.init();"/>
         <toolbarbutton id="appmenu_addonDebugging"
                        class="subviewbutton subviewbutton-iconic"
                        label="&debugAddonsCmd.label;"
                        accesskey="&debugAddonsCmd.accesskey;"
                        oncommand="openAboutDebugging('addons')"/>
         <toolbarbutton id="appmenu_tabsDebugging"
                        class="subviewbutton subviewbutton-iconic"
                        label="&tabsDebugCmd.label;"
--- a/mail/components/devtools/devtools-loader.jsm
+++ b/mail/components/devtools/devtools-loader.jsm
@@ -16,20 +16,20 @@ DevToolsStartup.prototype = {
     // We want to overwrite the -devtools flag and open the toolbox instead
     let devtoolsFlag = cmdLine.handleFlag("devtools", false);
     if (devtoolsFlag) {
       this.handleDevToolsFlag(cmdLine);
     }
   },
 
   handleDevToolsFlag(cmdLine) {
-    const { BrowserToolboxProcess } = ChromeUtils.import(
+    const { BrowserToolboxLauncher } = ChromeUtils.import(
       "resource://devtools/client/framework/browser-toolbox/Launcher.jsm"
     );
-    BrowserToolboxProcess.init();
+    BrowserToolboxLauncher.init();
 
     if (cmdLine.state == Ci.nsICommandLine.STATE_REMOTE_AUTO) {
       cmdLine.preventDefault = true;
     }
   },
 
   initialize() {
     let { loader, require, DevToolsLoader } = ChromeUtils.import(