Backed out changeset ad2610a5e6ba (bug 1369801)

MozReview-Commit-ID: 8fzyVFiiN0D

devtools/client/preferences/devtools.js

@@ -47,6 +47,8 @@ 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);

devtools/shim/devtools-startup-prefs.js

@@ -11,9 +11,6 @@
 // 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");