Bug 1306264 - Move chrome://browser/skin/theme-switcher-icon.png reference from CustomizeMode.jsm to theme code. r=jaws
authorDão Gottwald <dao@mozilla.com>
Fri, 30 Sep 2016 09:39:27 +0200
changeset 315891 5926f524fb37c1853fb34f15540fa9ef0a73c3a3
parent 315890 8502d0e88cf5b60fcc49c53f6ab9a56c1f8d09af
child 315892 acffb71ed793d03b5e2019a78ed6585f4c18ee8b
push id82309
push userdgottwald@mozilla.com
push dateFri, 30 Sep 2016 07:40:57 +0000
treeherdermozilla-inbound@5926f524fb37 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1306264
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1306264 - Move chrome://browser/skin/theme-switcher-icon.png reference from CustomizeMode.jsm to theme code. r=jaws
browser/components/customizableui/CustomizeMode.jsm
browser/themes/shared/customizableui/customizeMode.inc.css
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -148,20 +148,18 @@ CustomizeMode.prototype = {
       this.enter();
     }
   },
 
   swatchForTheme: function(aDocument) {
    let lwthemeButton = aDocument.getElementById("customization-lwtheme-button");
    let lwthemeIcon = aDocument.getAnonymousElementByAttribute(lwthemeButton,
           "class", "button-icon");
-   let imageURL = LightweightThemeManager.currentTheme === null ?
-          "chrome://browser/skin/theme-switcher-icon.png" :
-          LightweightThemeManager.currentTheme.iconURL;
-    lwthemeIcon.style.backgroundImage = "url(" + imageURL + ")";
+   lwthemeIcon.style.backgroundImage = LightweightThemeManager.currentTheme ?
+     "url(" + LightweightThemeManager.currentTheme.iconURL + ")" : "";
   },
 
   setTab: function(aTab) {
     if (gTab == aTab) {
       return;
     }
 
     if (gTab) {
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -189,16 +189,17 @@
   /* Sadly, button.css thinks its margins are perfect for everyone. */
   margin-inline-start: 6px !important;
 }
 
 #customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
   width: 20px;
   height: 20px;
   border-radius: 2px;
+  background-image: url("chrome://browser/skin/theme-switcher-icon.png");
   background-size: contain;
 }
 
 %ifdef CAN_DRAW_IN_TITLEBAR
 #customization-titlebar-visibility-button {
   list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
   -moz-image-region: rect(0, 24px, 24px, 0);
 }