From b605783cb3e87f567e2dc4d69afd43b1390f572d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sat, 8 Nov 2014 20:30:00 +0100
Subject: [PATCH] Bug 1093368 - Customize mode theme picker shouldn't pass the
 default theme object to LightweightThemeManager.previewTheme. r=jaws

---
 browser/base/content/browser-devedition.js              | 3 +--
 browser/base/content/test/general/browser_devedition.js | 2 +-
 browser/components/customizableui/CustomizeMode.jsm     | 3 ++-
 toolkit/mozapps/extensions/LightweightThemeManager.jsm  | 3 ---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/browser-devedition.js b/browser/base/content/browser-devedition.js
index e82578cdb8f7..e28875a8f95c 100644
--- a/browser/base/content/browser-devedition.js
+++ b/browser/base/content/browser-devedition.js
@@ -14,7 +14,6 @@ let DevEdition = {
 
   styleSheetLocation: "chrome://browser/skin/devedition.css",
   styleSheet: null,
-  defaultThemeID: "{972ce4c6-7e08-4474-a285-3208198ce6fd}",
 
   init: function () {
     this._updateDevtoolsThemeAttribute();
@@ -32,7 +31,7 @@ let DevEdition = {
   observe: function (subject, topic, data) {
     if (topic == "lightweight-theme-styling-update") {
       let newTheme = JSON.parse(data);
-      if (!newTheme || newTheme.id === this.defaultThemeID) {
+      if (!newTheme) {
         // A lightweight theme has been unapplied, so just re-read prefs.
         this._updateStyleSheetFromPrefs();
       } else {
diff --git a/browser/base/content/test/general/browser_devedition.js b/browser/base/content/test/general/browser_devedition.js
index 36d77fcb40b5..5cd9fd3ecf3e 100644
--- a/browser/base/content/test/general/browser_devedition.js
+++ b/browser/base/content/test/general/browser_devedition.js
@@ -105,7 +105,7 @@ function testLightweightThemePreview() {
   info ("Turning the pref on, then previewing the default theme, turning it off and resetting the preview");
   Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
   ok (DevEdition.styleSheet, "The devedition stylesheet is enabled.");
-  LightweightThemeManager.previewTheme(dummyLightweightTheme("{972ce4c6-7e08-4474-a285-3208198ce6fd}"));
+  LightweightThemeManager.previewTheme(null);
   ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after the default theme is applied.");
   LightweightThemeManager.resetPreview();
   ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after resetting the preview.");
diff --git a/browser/components/customizableui/CustomizeMode.jsm b/browser/components/customizableui/CustomizeMode.jsm
index fac0f1bea5ef..09fb35593e86 100644
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -1293,7 +1293,8 @@ CustomizeMode.prototype = {
     const RECENT_LWT_COUNT = 5;
 
     function previewTheme(aEvent) {
-      LightweightThemeManager.previewTheme(aEvent.target.theme);
+      LightweightThemeManager.previewTheme(aEvent.target.theme.id != DEFAULT_THEME_ID ?
+                                           aEvent.target.theme : null);
     }
 
     function resetPreview() {
diff --git a/toolkit/mozapps/extensions/LightweightThemeManager.jsm b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
index c7adc81f53f9..fc0a564a4935 100644
--- a/toolkit/mozapps/extensions/LightweightThemeManager.jsm
+++ b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
@@ -142,9 +142,6 @@ this.LightweightThemeManager = {
   },
 
   previewTheme: function LightweightThemeManager_previewTheme(aData) {
-    if (!aData)
-      return;
-
     let cancel = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
     cancel.data = false;
     Services.obs.notifyObservers(cancel, "lightweight-theme-preview-requested",