Backed out changeset a31f0c8450a8 (bug 1369801)

MozReview-Commit-ID: 6jOXOX1WfFy

devtools/client/preferences/DevToolsPreferences.jsm

@@ -39,7 +39,7 @@ function cleanupPreferencesFileContent(content) {
   let newLines = [];
   let continuation = false;
   for (let line of lines) {
-    let isPrefLine = /^ *pref\("([^"]+)"/.test(line);
+    let isPrefLine = /^ *(sticky_)?pref\("([^"]+)"/.test(line);
     if (continuation || isPrefLine) {
       newLines.push(line);
       // The call to pref(...); might span more than one line.

devtools/client/preferences/devtools.js

@@ -231,6 +231,13 @@ pref("devtools.dom.enabled", false);
 // Web Audio Editor Inspector Width should be a preference
 pref("devtools.webaudioeditor.inspectorWidth", 300);
 
+// Default theme ("dark" or "light")
+#ifdef MOZ_DEV_EDITION
+sticky_pref("devtools.theme", "dark");
+#else
+sticky_pref("devtools.theme", "light");
+#endif
+
 // Web console filters
 pref("devtools.webconsole.filter.error", true);
 pref("devtools.webconsole.filter.warn", true);

devtools/shim/devtools-startup-prefs.js

@@ -10,10 +10,3 @@
 
 // Enable the JSON View tool (an inspector for application/json documents).
 pref("devtools.jsonview.enabled", true);
-
-// Default theme ("dark" or "light")
-#ifdef MOZ_DEV_EDITION
-sticky_pref("devtools.theme", "dark");
-#else
-sticky_pref("devtools.theme", "light");
-#endif

devtools/shim/moz.build

@@ -6,7 +6,7 @@
 
 JAR_MANIFESTS += ['jar.mn']
 
-JS_PREFERENCE_PP_FILES += [
+JS_PREFERENCE_FILES += [
     'devtools-startup-prefs.js',
 ]