Bug 1461970 - Remove gcli references from startup folder. r=jryans
MozReview-Commit-ID: I4Osp8qFvwv
--- a/devtools/startup/devtools-startup.js
+++ b/devtools/startup/devtools-startup.js
@@ -21,20 +21,16 @@
"use strict";
const kDebuggerPrefs = [
"devtools.debugger.remote-enabled",
"devtools.chrome.enabled"
];
-// If devtools.toolbar.visible is set to true, the developer toolbar should appear on
-// startup.
-const TOOLBAR_VISIBLE_PREF = "devtools.toolbar.visible";
-
const DEVTOOLS_ENABLED_PREF = "devtools.enabled";
const DEVTOOLS_POLICY_DISABLED_PREF = "devtools.policy.disabled";
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
ChromeUtils.defineModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
@@ -85,22 +81,16 @@ XPCOMUtils.defineLazyGetter(this, "KeySh
modifiers
},
// All locales are using F12
{
id: "toggleToolboxF12",
shortcut: KeyShortcutsBundle.GetStringFromName("toggleToolboxF12.commandkey"),
modifiers: "" // F12 is the only one without modifiers
},
- // Toggle the visibility of the Developer Toolbar (=gcli)
- {
- id: "toggleToolbar",
- shortcut: KeyShortcutsBundle.GetStringFromName("toggleToolbar.commandkey"),
- modifiers: "shift"
- },
// Open WebIDE window
{
id: "webide",
shortcut: KeyShortcutsBundle.GetStringFromName("webide.commandkey"),
modifiers: "shift"
},
// Open the Browser Toolbox
{
@@ -191,17 +181,17 @@ DevToolsStartup.prototype = {
* Boolean flag to check if DevTools have been already initialized or not.
* By initialized, we mean that its main modules are loaded.
*/
initialized: false,
/**
* Boolean flag to check if the devtools initialization was already sent to telemetry.
* We only want to record one devtools entry point per Firefox run, but we are not
- * interested in all the entry points (e.g. devtools.toolbar.visible).
+ * interested in all the entry points.
*/
recorded: false,
get telemetry() {
if (!this._telemetry) {
this._telemetry = new Telemetry();
this._telemetry.setEventRecordingEnabled("devtools.main", true);
}
@@ -284,22 +274,16 @@ DevToolsStartup.prototype = {
onWindowReady(window) {
if (this.isDisabledByPolicy()) {
this.removeDevToolsMenus(window);
return;
}
this.hookWindow(window);
- if (Services.prefs.getBoolPref(TOOLBAR_VISIBLE_PREF, false)) {
- // Loading devtools-browser will open the developer toolbar by also checking this
- // pref.
- this.initDevTools("DeveloperToolbar");
- }
-
// This listener is called for all Firefox windows, but we want to execute some code
// only once.
if (!this._firstWindowReadyReceived) {
this.onFirstWindowReady(window);
this._firstWindowReadyReceived = true;
}
JsonView.initialize();
@@ -552,18 +536,17 @@ DevToolsStartup.prototype = {
// Nothing to do if DevTools are already enabled.
return;
}
// We only consider checking the actual isDevToolsUser() if the user is in the
// "regular" experiment group.
let isDevToolsUser = isRegularExperiment && this.isDevToolsUser();
- let hasToolbarPref = Services.prefs.getBoolPref(TOOLBAR_VISIBLE_PREF, false);
- if (hasDevToolsFlag || hasToolbarPref || isDevToolsUser) {
+ if (hasDevToolsFlag || isDevToolsUser) {
Services.prefs.setBoolPref(DEVTOOLS_ENABLED_PREF, true);
}
},
hookKeyShortcuts(window) {
let doc = window.document;
// hookKeyShortcuts can be called both from hookWindow and from the developer toggle
--- a/devtools/startup/locales/en-US/key-shortcuts.properties
+++ b/devtools/startup/locales/en-US/key-shortcuts.properties
@@ -5,20 +5,16 @@
# LOCALIZATION NOTE (toggleToolbox.commandkey):
# Key pressed to open a toolbox with the default panel selected
toggleToolbox.commandkey=I
# LOCALIZATION NOTE (toggleToolboxF12.commandkey):
# Alternative key pressed to open a toolbox with the default panel selected
toggleToolboxF12.commandkey=VK_F12
-# LOCALIZATION NOTE (toggleToolbar.commandkey):
-# Key pressed to open the Developer Toolbar (a.k.a gcli)
-toggleToolbar.commandkey=VK_F2
-
# LOCALIZATION NOTE (webide.commandkey):
# Key pressed to open the Web IDE window
webide.commandkey=VK_F8
# LOCALIZATION NOTE (browserToolbox.commandkey):
# Key pressed to open the Browser Toolbox, used for debugging Firefox itself
browserToolbox.commandkey=I
--- a/devtools/startup/preferences/devtools-startup.js
+++ b/devtools/startup/preferences/devtools-startup.js
@@ -10,19 +10,16 @@ pref("devtools.jsonview.enabled", true);
// Default theme ("dark" or "light")
#ifdef MOZ_DEV_EDITION
pref("devtools.theme", "dark", sticky);
#else
pref("devtools.theme", "light", sticky);
#endif
-// Should the devtools toolbar be opened on startup
-pref("devtools.toolbar.visible", false);
-
// Pref to drive the devtools onboarding flow experiment. States:
// - off: forces devtools.enabled to true
// - on: devtools.enabled is not forced to true.
// - force: devtools.enabled is not forced to true and cannot be set to true by checking
// devtools.selfxss.count. User will have to go through onboarding to use DevTools.
pref("devtools.onboarding.experiment", "off");
// If devtools.onboarding.experiment is set to "on" or "force", we will flip the