Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1193204 - Remove browser.devedition.theme.enabled check when unapplying theme in ui migration;r=Gijs

Browse Source 
--HG--
extra : commitid : BmgzQfYzyUc
This commit is contained in:
Brian Grinstead 2015-08-12 09:27:30 -07:00
parent c7251cee4b
commit 5594d23b47
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/components/nsBrowserGlue.js
View File

@ -2118,16 +2118,10 @@ BrowserGlue.prototype = {
defaultThemeSelected = Services.prefs.getCharPref("general.skins.selectedSkin") == "classic/1.0"; defaultThemeSelected = Services.prefs.getCharPref("general.skins.selectedSkin") == "classic/1.0";
} catch(e) {} } catch(e) {}
let deveditionThemeEnabled = false;
try {
deveditionThemeEnabled = Services.prefs.getBoolPref("browser.devedition.theme.enabled");
} catch(e) {}
// If we are on the devedition channel, the devedition theme is on by // If we are on the devedition channel, the devedition theme is on by
// default. But we need to handle the case where they didn't want it // default. But we need to handle the case where they didn't want it
// applied, and unapply the theme. // applied, and unapply the theme.
let userChoseToNotUseDeveditionTheme = let userChoseToNotUseDeveditionTheme =
!deveditionThemeEnabled ||
!defaultThemeSelected || !defaultThemeSelected ||
(lightweightThemeSelected && selectedThemeID != "firefox-devedition@mozilla.org"); (lightweightThemeSelected && selectedThemeID != "firefox-devedition@mozilla.org");
@ -2135,8 +2129,6 @@ BrowserGlue.prototype = {
Services.prefs.setCharPref("lightweightThemes.selectedThemeID", ""); Services.prefs.setCharPref("lightweightThemes.selectedThemeID", "");
} }
// Not clearing browser.devedition.theme.enabled, to preserve user's pref
// if for some reason this function runs again (even though it shouldn't)
Services.prefs.clearUserPref("browser.devedition.showCustomizeButton"); Services.prefs.clearUserPref("browser.devedition.showCustomizeButton");
} }