Follow-up to bug 518859. r=dtownsend
authorDão Gottwald <dao@mozilla.com>
Sun, 04 Oct 2009 11:28:45 +0200
changeset 33439 9871bc47451fd028dd5fd28c984bf346e0659bfd
parent 33438 a051d25333fc03af727805e9bab8cf1309a2e946
child 33440 ddd79f809784b03c81af7f427146ec483ee05072
push idunknown
push userunknown
push dateunknown
reviewersdtownsend
bugs518859
milestone1.9.3a1pre
Follow-up to bug 518859. r=dtownsend
toolkit/content/LightweightThemeConsumer.jsm
toolkit/content/Makefile.in
--- a/toolkit/content/LightweightThemeConsumer.jsm
+++ b/toolkit/content/LightweightThemeConsumer.jsm
@@ -91,25 +91,25 @@ LightweightThemeConsumer.prototype = {
       let footer = this._doc.getElementById(this._footerId);
       _setImage(footer, active, aData.footerURL);
       if (active && aData.footerURL)
         footer.setAttribute("lwthemefooter", "true");
       else
         footer.removeAttribute("lwthemefooter");
     }
 
-    if (/^Mac/.test(this._doc.defaultView.navigator.platform)) {
-      if (active && aData.accentcolor) {
-        root.setAttribute("activetitlebarcolor", aData.accentcolor);
-        root.setAttribute("inactivetitlebarcolor", aData.accentcolor);
-      } else {
-        root.removeAttribute("activetitlebarcolor");
-        root.removeAttribute("inactivetitlebarcolor");
-      }
+#ifdef XP_MACOSX
+    if (active && aData.accentcolor) {
+      root.setAttribute("activetitlebarcolor", aData.accentcolor);
+      root.setAttribute("inactivetitlebarcolor", aData.accentcolor);
+    } else {
+      root.removeAttribute("activetitlebarcolor");
+      root.removeAttribute("inactivetitlebarcolor");
     }
+#endif
   }
 }
 
 function _setImage(aElement, aActive, aURL) {
   aElement.style.backgroundImage =
     (aActive && aURL) ? 'url("' + aURL.replace('"', '\\"', "g") + '")' : "";
 }
 
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -74,16 +74,17 @@ ifeq (http,$(patsubst http%,http,$(SOURC
 DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)"
 endif
 
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
 EXTRA_JS_MODULES = \
-  debug.js \
-  LightweightThemeConsumer.jsm \
   WindowDraggingUtils.jsm \
   $(NULL)
 
-EXTRA_PP_JS_MODULES = debug.js
+EXTRA_PP_JS_MODULES = \
+  debug.js \
+  LightweightThemeConsumer.jsm \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk