Bug 1223412 - Fix the last bits of file duplication in themes. r=Gijs

toolkit/themes/osx/mozapps/jar.mn

@@ -41,10 +41,6 @@ toolkit.jar:
   skin/classic/mozapps/passwordmgr/key-16.png                     (passwordmgr/key-16.png)
   skin/classic/mozapps/passwordmgr/key-16@2x.png                  (passwordmgr/key-16@2x.png)
   skin/classic/mozapps/passwordmgr/key-64.png                     (passwordmgr/key-64.png)
-  skin/classic/mozapps/formautofill/requestAutocomplete.css       (../../shared/formautofill/requestAutocomplete.css)
-  skin/classic/mozapps/plugins/pluginProblem.css                  (../../shared/plugins/pluginProblem.css)
-  skin/classic/mozapps/aboutNetworking.css                        (../../shared/aboutNetworking.css)
-  skin/classic/mozapps/aboutServiceWorkers.css                    (../../shared/aboutServiceWorkers.css)
   skin/classic/mozapps/plugins/notifyPluginGeneric.png            (plugins/notifyPluginGeneric.png)
   skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png                  (plugins/pluginBlocked.png)

toolkit/themes/shared/non-mac.jar.inc.mn

@@ -23,7 +23,9 @@
   skin/classic/global/resizer.css                          (../../windows/global/resizer.css)
   skin/classic/global/richlistbox.css                      (../../windows/global/richlistbox.css)
   skin/classic/global/scale.css                            (../../windows/global/scale.css)
+#ifndef MOZ_THEME_FASTSTRIPE
   skin/classic/global/scrollbars.css                       (../../windows/global/xulscrollbars.css)
+#endif
   skin/classic/global/spinbuttons.css                      (../../windows/global/spinbuttons.css)
   skin/classic/global/tabprompts.css                       (../../windows/global/tabprompts.css)
   skin/classic/global/wizard.css                           (../../windows/global/wizard.css)

toolkit/themes/windows/global/jar.mn

@@ -6,31 +6,33 @@
 
 toolkit.jar:
 * skin/classic/global/autocomplete.css
+#ifndef MOZ_THEME_FASTSTRIPE
   skin/classic/global/button.css
   skin/classic/global/checkbox.css
+  skin/classic/global/dropmarker.css
+  skin/classic/global/groupbox.css
+* skin/classic/global/menu.css
+  skin/classic/global/menulist.css
+* skin/classic/global/popup.css
+  skin/classic/global/radio.css
+  skin/classic/global/tabbox.css
+  skin/classic/global/textbox.css
+#endif
   skin/classic/global/colorpicker.css
   skin/classic/global/commonDialog.css
-  skin/classic/global/dropmarker.css
   skin/classic/global/filepicker.css
   skin/classic/global/Filepicker.png                       (filepicker/Filepicker.png)
   skin/classic/global/findBar.css
 * skin/classic/global/global.css
-  skin/classic/global/groupbox.css
   skin/classic/global/listbox.css
-* skin/classic/global/menu.css
-  skin/classic/global/menulist.css
   skin/classic/global/netError.css
   skin/classic/global/numberbox.css
 * skin/classic/global/notification.css
-* skin/classic/global/popup.css
   skin/classic/global/preferences.css
   skin/classic/global/printPageSetup.css
   skin/classic/global/printPreview.css
-  skin/classic/global/radio.css
   skin/classic/global/scrollbox.css
   skin/classic/global/splitter.css
-  skin/classic/global/tabbox.css
-  skin/classic/global/textbox.css
   skin/classic/global/toolbar.css
   skin/classic/global/toolbarbutton.css
 * skin/classic/global/tree.css

toolkit/themes/windows/global/moz.build

@@ -4,4 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
+
+if CONFIG['MOZ_THEME_FASTSTRIPE']:
+    DEFINES['MOZ_THEME_FASTSTRIPE'] = True

toolkit/themes/windows/mozapps/jar.mn

@@ -6,7 +6,6 @@ toolkit.jar:
 #include ../../shared/mozapps.inc.mn
   skin/classic/mozapps/downloads/downloadIcon.png            (downloads/downloadIcon.png)
   skin/classic/mozapps/downloads/downloads.css               (downloads/downloads.css)
-  skin/classic/mozapps/extensions/about.css                  (extensions/about.css)
 * skin/classic/mozapps/extensions/extensions.css             (extensions/extensions.css)
 * skin/classic/mozapps/extensions/selectAddons.css           (extensions/selectAddons.css)
   skin/classic/mozapps/extensions/category-search.png        (extensions/category-search.png)