Follow-up to bug 518859. r=dtownsend

toolkit/content/LightweightThemeConsumer.jsm

@@ -96,15 +96,15 @@ LightweightThemeConsumer.prototype = {
         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
   }
 }
 

toolkit/content/Makefile.in

@@ -79,11 +79,12 @@ 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