summaryrefslogtreecommitdiffstats
path: root/application/basilisk/components
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-08-14 20:08:49 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-08-14 20:08:49 +0200
commitcdd54fbe1376e13c1b941ca07df4728016f2e432 (patch)
tree23873d918ee2a38f9b275fca8f7fda0bc55a9050 /application/basilisk/components
parent9f7b943c1de5e9ae010ff839ee7e601a081d42e1 (diff)
downloadUXP-cdd54fbe1376e13c1b941ca07df4728016f2e432.tar
UXP-cdd54fbe1376e13c1b941ca07df4728016f2e432.tar.gz
UXP-cdd54fbe1376e13c1b941ca07df4728016f2e432.tar.lz
UXP-cdd54fbe1376e13c1b941ca07df4728016f2e432.tar.xz
UXP-cdd54fbe1376e13c1b941ca07df4728016f2e432.zip
Issue #1124: [Basilisk] Remove Dev Edition front-end tie-ins.
Diffstat (limited to 'application/basilisk/components')
-rw-r--r--application/basilisk/components/nsBrowserGlue.js23
1 files changed, 2 insertions, 21 deletions
diff --git a/application/basilisk/components/nsBrowserGlue.js b/application/basilisk/components/nsBrowserGlue.js
index 7c48473ae..5d3e4689b 100644
--- a/application/basilisk/components/nsBrowserGlue.js
+++ b/application/basilisk/components/nsBrowserGlue.js
@@ -676,19 +676,6 @@ BrowserGlue.prototype = {
// Ensure we keep track of places/pw-mananager undo by init'ing this early.
Cu.import("resource:///modules/AutoMigrate.jsm");
- if (!AppConstants.RELEASE_OR_BETA) {
- let themeName = gBrowserBundle.GetStringFromName("deveditionTheme.name");
- let vendorShortName = gBrandBundle.GetStringFromName("vendorShortName");
-
- LightweightThemeManager.addBuiltInTheme({
- id: "firefox-devedition@mozilla.org",
- name: themeName,
- headerURL: "resource:///chrome/browser/content/browser/defaultthemes/devedition.header.png",
- iconURL: "resource:///chrome/browser/content/browser/defaultthemes/devedition.icon.png",
- author: vendorShortName,
- });
- }
-
TabCrashHandler.init();
Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
@@ -1943,14 +1930,8 @@ BrowserGlue.prototype = {
defaultThemeSelected = Services.prefs.getCharPref("general.skins.selectedSkin") == "classic/1.0";
} catch (e) {}
- // 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
- // applied, and unapply the theme.
- let userChoseToNotUseDeveditionTheme =
- !defaultThemeSelected ||
- (lightweightThemeSelected && selectedThemeID != "firefox-devedition@mozilla.org");
-
- if (userChoseToNotUseDeveditionTheme && selectedThemeID == "firefox-devedition@mozilla.org") {
+ // If we have the dev edition theme selected, reset it.
+ if (selectedThemeID == "firefox-devedition@mozilla.org") {
Services.prefs.setCharPref("lightweightThemes.selectedThemeID", "");
}