Bug 1369801 - move devtools.inspector.enabled to devtools-startup-prefs;r=ochameau draft
authorJulian Descottes <jdescottes@mozilla.com>
Tue, 25 Jul 2017 22:09:01 +0200
changeset 615328 addcc93f8f567e1249618483eb70f10889f82ca4
parent 615278 b1f3c727181d1e78316b9dff8409aa860d772c98
child 639142 7db9c340ae08175b54de4fece18c421abf45bd1d
push id70318
push userjdescottes@mozilla.com
push dateTue, 25 Jul 2017 20:13:44 +0000
reviewersochameau
bugs1369801
milestone56.0a1
Bug 1369801 - move devtools.inspector.enabled to devtools-startup-prefs;r=ochameau MozReview-Commit-ID: BojshjPhVGe
devtools/client/preferences/devtools.js
devtools/shim/devtools-startup-prefs.js
--- a/devtools/client/preferences/devtools.js
+++ b/devtools/client/preferences/devtools.js
@@ -42,18 +42,16 @@ pref("devtools.command-button-paintflash
 pref("devtools.command-button-scratchpad.enabled", false);
 pref("devtools.command-button-responsive.enabled", true);
 pref("devtools.command-button-screenshot.enabled", false);
 pref("devtools.command-button-rulers.enabled", false);
 pref("devtools.command-button-measure.enabled", false);
 pref("devtools.command-button-noautohide.enabled", false);
 
 // Inspector preferences
-// Enable the Inspector
-pref("devtools.inspector.enabled", true);
 // What was the last active sidebar in the inspector
 pref("devtools.inspector.activeSidebar", "ruleview");
 pref("devtools.inspector.remote", false);
 // Collapse pseudo-elements by default in the rule-view
 pref("devtools.inspector.show_pseudo_elements", false);
 // The default size for image preview tooltips in the rule-view/computed-view/markup-view
 pref("devtools.inspector.imagePreviewTooltipSize", 300);
 // Enable user agent style inspection in rule-view
--- a/devtools/shim/devtools-startup-prefs.js
+++ b/devtools/shim/devtools-startup-prefs.js
@@ -6,14 +6,17 @@
 // Most DevTools prefs are included with the addon and loaded dynamically during the addon
 // startup. For preferences that are required before the addon is loaded or that we can't
 // process in JS, they can be defined in this file.
 // Note that this preference file follows Firefox release cycle.
 
 // Enable the JSON View tool (an inspector for application/json documents).
 pref("devtools.jsonview.enabled", true);
 
+// Enable the Inspector, this preference is used from mozilla-central.
+pref("devtools.inspector.enabled", true);
+
 // Default theme ("dark" or "light")
 #ifdef MOZ_DEV_EDITION
 sticky_pref("devtools.theme", "dark");
 #else
 sticky_pref("devtools.theme", "light");
 #endif