From e7a8569efe0b224a59d5b3a8f08fa5231921d498 Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Tue, 25 Jul 2017 22:09:01 +0200 Subject: [PATCH] Bug 1369801 - move devtools.inspector.enabled to devtools-startup-prefs;r=ochameau MozReview-Commit-ID: BojshjPhVGe --HG-- extra : rebase_source : c1d82bfd8bd0108ea3f30c7573a4c4d597b6979f --- devtools/client/preferences/devtools.js | 2 -- devtools/shim/devtools-startup-prefs.js | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js index 5a17dc044742..3223962b7538 100644 --- a/devtools/client/preferences/devtools.js +++ b/devtools/client/preferences/devtools.js @@ -47,8 +47,6 @@ 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); diff --git a/devtools/shim/devtools-startup-prefs.js b/devtools/shim/devtools-startup-prefs.js index 44bd23fd6e80..1ab086425e0c 100644 --- a/devtools/shim/devtools-startup-prefs.js +++ b/devtools/shim/devtools-startup-prefs.js @@ -11,6 +11,9 @@ // 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");