Bug 1461970 - Remove gcli menu. r=jryans
MozReview-Commit-ID: FQMkNvoUFGv
--- a/devtools/client/framework/devtools-browser.js
+++ b/devtools/client/framework/devtools-browser.js
@@ -87,25 +87,16 @@ var gDevToolsBrowser = exports.gDevTools
cmd.removeAttribute("disabled");
cmd.removeAttribute("hidden");
} else {
cmd.setAttribute("disabled", "true");
cmd.setAttribute("hidden", "true");
}
}
- // Enable developer toolbar?
- let devToolbarEnabled = Services.prefs.getBoolPref("devtools.toolbar.enabled");
- toggleMenuItem("menu_devToolbar", devToolbarEnabled);
- let focusEl = doc.getElementById("menu_devToolbar");
- if (devToolbarEnabled) {
- focusEl.removeAttribute("disabled");
- } else {
- focusEl.setAttribute("disabled", "true");
- }
// Enable WebIDE?
let webIDEEnabled = Services.prefs.getBoolPref("devtools.webide.enabled");
toggleMenuItem("menu_webide", webIDEEnabled);
if (webIDEEnabled) {
gDevToolsBrowser.installWebIDEWidget();
} else {
gDevToolsBrowser.uninstallWebIDEWidget();
--- a/devtools/client/framework/test/browser_dynamic_tool_enabling.js
+++ b/devtools/client/framework/test/browser_dynamic_tool_enabling.js
@@ -1,17 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that toggling prefs immediately (de)activates the relevant menuitem
var gItemsToTest = {
- "menu_devToolbar": "devtools.toolbar.enabled",
"menu_browserToolbox": ["devtools.chrome.enabled", "devtools.debugger.remote-enabled"],
"menu_devtools_connect": "devtools.debugger.remote-enabled",
};
function expectedAttributeValueFromPrefs(prefs) {
return prefs.every((pref) => Services.prefs.getBoolPref(pref)) ?
"" : "true";
}
--- a/devtools/client/locales/en-US/menus.properties
+++ b/devtools/client/locales/en-US/menus.properties
@@ -36,19 +36,16 @@ browserToolboxMenu.label = Browser Toolb
browserToolboxMenu.accesskey = e
# LOCALIZATION NOTE (browserContentToolboxMenu.label): This is the label for the
# application menu item that opens the browser content toolbox UI in the Tools menu.
# This toolbox allows to debug the chrome of the content process in multiprocess builds.
browserContentToolboxMenu.label = Browser Content Toolbox
browserContentToolboxMenu.accesskey = x
-devToolbarMenu.label = Developer Toolbar
-devToolbarMenu.accesskey = v
-
webide.label = WebIDE
webide.accesskey = W
devToolboxMenuItem.label = Toggle Tools
devToolboxMenuItem.accesskey = T
getMoreDevtoolsCmd.label = Get More Tools
getMoreDevtoolsCmd.accesskey = M
--- a/devtools/client/menus.js
+++ b/devtools/client/menus.js
@@ -45,33 +45,16 @@ exports.menuitems = [
let window = event.target.ownerDocument.defaultView;
gDevToolsBrowser.toggleToolboxCommand(window.gBrowser, Cu.now());
},
keyId: "toggleToolbox",
checkbox: true
},
{ id: "menu_devtools_separator",
separator: true },
- { id: "menu_devToolbar",
- l10nKey: "devToolbarMenu",
- disabled: true,
- oncommand(event) {
- let window = event.target.ownerDocument.defaultView;
- // Distinguish events when selecting a menuitem, where we either open
- // or close the toolbar and when hitting the key shortcut where we just
- // focus the toolbar if it doesn't already has it.
- if (event.target.tagName.toLowerCase() == "menuitem") {
- gDevToolsBrowser.getDeveloperToolbar(window).toggle();
- } else {
- gDevToolsBrowser.getDeveloperToolbar(window).focusToggle();
- }
- },
- keyId: "toggleToolbar",
- checkbox: true
- },
{ id: "menu_webide",
l10nKey: "webide",
disabled: true,
oncommand() {
gDevToolsBrowser.openWebIDE();
},
keyId: "webide",
},