Commit cb93c8b8 authored by Nicholas Nethercote's avatar Nicholas Nethercote
Browse files

Bug 440908 - Convert sticky prefs in default pref files to the new syntax. r=glandium 

MozReview-Commit-ID: GgkNSsdGhBV

--HG--
extra : rebase_source : efaf5f79ab7b608975ee960057d8be380061fdc0
parent 038a72de

browser/app/profile/firefox.js

+4 −3
Original line number Diff line number Diff line
@@ -1242,9 +1242,10 @@ pref("services.sync.syncedTabs.showRemoteIcons", true); 


// Developer edition preferences

#ifdef MOZ_DEV_EDITION

sticky_pref("lightweightThemes.selectedThemeID", "firefox-compact-dark@mozilla.org");

pref("lightweightThemes.selectedThemeID", "firefox-compact-dark@mozilla.org",

     sticky);

#else

sticky_pref("lightweightThemes.selectedThemeID", "");

pref("lightweightThemes.selectedThemeID", "", sticky);

#endif



// Whether the character encoding menu is under the main Firefox button. This
@@ -1266,7 +1267,7 @@ pref("browser.newtabpage.introShown", false); 
pref("browser.newtabpage.enabled", true);



// Toggles the directory tiles content of 'about:newtab'.

sticky_pref("browser.newtabpage.enhanced", true);

pref("browser.newtabpage.enhanced", true, sticky);



// enables Activity Stream inspired layout

pref("browser.newtabpage.compact", false);

devtools/shim/devtools-startup-prefs.js

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ pref("devtools.jsonview.enabled", true); 


// Default theme ("dark" or "light")

#ifdef MOZ_DEV_EDITION

sticky_pref("devtools.theme", "dark");

pref("devtools.theme", "dark", sticky);

#else

sticky_pref("devtools.theme", "light");

pref("devtools.theme", "light", sticky);

#endif



// Should the devtools toolbar be opened on startup

modules/libpref/init/all.js

+8 −8
Original line number Diff line number Diff line
@@ -1089,23 +1089,23 @@ pref("devtools.errorconsole.deprecation_warnings", true); 


#ifdef NIGHTLY_BUILD

// Don't show the Browser Toolbox prompt on local builds / nightly

sticky_pref("devtools.debugger.prompt-connection", false);

pref("devtools.debugger.prompt-connection", false, sticky);

#else

sticky_pref("devtools.debugger.prompt-connection", true);

pref("devtools.debugger.prompt-connection", true, sticky);

#endif



#ifdef MOZILLA_OFFICIAL

// Disable debugging chrome

sticky_pref("devtools.chrome.enabled", false);

pref("devtools.chrome.enabled", false, sticky);

// Disable remote debugging connections

sticky_pref("devtools.debugger.remote-enabled", false);

pref("devtools.debugger.remote-enabled", false, sticky);

// enable JS dump() function.

sticky_pref("browser.dom.window.dump.enabled", false);

pref("browser.dom.window.dump.enabled", false, sticky);

#else

// In local builds, enable the browser toolbox by default

sticky_pref("devtools.chrome.enabled", true);

sticky_pref("devtools.debugger.remote-enabled", true);

sticky_pref("browser.dom.window.dump.enabled", true);

pref("devtools.chrome.enabled", true, sticky);

pref("devtools.debugger.remote-enabled", true, sticky);

pref("browser.dom.window.dump.enabled", true, sticky);

#endif

modules/libpref/test/unit/data/testPrefSticky.js

+1 −1
Original line number Diff line number Diff line 
pref("testPref.unsticky.bool", true);

sticky_pref("testPref.sticky.bool", false);
 
pref("testPref.sticky.bool", false, sticky);

modules/libpref/test/unit/data/testPrefStickyUser.js

+1 −1
Original line number Diff line number Diff line 
// testPrefSticky.js defined this pref as a sticky_pref(). Once a sticky

// testPrefSticky.js defined this pref as sticky. Once a sticky

// pref has been changed, it's written as a user_pref().

// So this test file reflects that scenario.

// Note the default in testPrefSticky.js is also false.