Bug 1154218 - get rid of webapprt's downloads-aero.css, r=dao,marco

webapprt/themes/windows/downloads/downloads-aero.css

@@ -1,32 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-%include downloads.css
-
-@media (-moz-windows-compositor) {
-  #downloadManager {
-    -moz-appearance: -moz-win-glass;
-    background: transparent;
-  }
-
-  #downloadView {
-    /* Clamp glass bounds to the rich list so our glass haze stays constant. */
-    -moz-appearance: -moz-win-exclude-glass;
-    border: none;
-  }
-
-  windowdragbox {
-    -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
-  }
-
-  #clearListButton {
-    -moz-margin-start: 0;
-    margin-bottom: 0;
-  }
-
-  #searchbox {
-    -moz-margin-end: 0;
-    margin-bottom: 0;
-  }
-}

webapprt/themes/windows/downloads/downloads.css

@@ -110,3 +110,31 @@ richlistitem[type="download"] .dateTime {
   min-width: 0;
   margin-top: 3px;
 }
+
+@media (-moz-windows-compositor) {
+  #downloadManager {
+    -moz-appearance: -moz-win-glass;
+    background: transparent;
+  }
+
+  #downloadView {
+    /* Clamp glass bounds to the rich list so our glass haze stays constant. */
+    -moz-appearance: -moz-win-exclude-glass;
+    border: none;
+  }
+
+  windowdragbox {
+    -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+  }
+
+  #clearListButton {
+    -moz-margin-start: 0;
+    margin-bottom: 0;
+  }
+
+  #searchbox {
+    -moz-margin-end: 0;
+    margin-bottom: 0;
+  }
+}
+

webapprt/themes/windows/jar.mn

@@ -3,18 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 webapprt.jar:
-% skin webapprt classic/1.0 %skin/classic/webapprt/ os=WINNT osversion<6
-% skin webapprt classic/1.0 %skin/classic/webapprt/ os!=WINNT
-# NOTE: If you add a new file here, you'll need to add it to the aero
-# section at the bottom of this file
+% skin webapprt classic/1.0 %skin/classic/webapprt/
         skin/classic/webapprt/downloads/downloadButtons.png         (downloads/downloadButtons.png)
+        skin/classic/webapprt/downloads/downloadButtons-XP.png      (downloads/downloadButtons-XP.png)
         skin/classic/webapprt/downloads/downloadIcon.png            (downloads/downloadIcon.png)
+        skin/classic/webapprt/downloads/downloadIcon-XP.png         (downloads/downloadIcon-XP.png)
         skin/classic/webapprt/downloads/downloads.css               (downloads/downloads.css)
 
-#ifdef XP_WIN
-webapprt.jar:
-% skin webapprt classic/1.0 %skin/classic/aero/webapprt/ os=WINNT osversion>=6
-        skin/classic/aero/webapprt/downloads/downloadButtons.png            (downloads/downloadButtons-aero.png)
-        skin/classic/aero/webapprt/downloads/downloadIcon.png               (downloads/downloadIcon-aero.png)
-*       skin/classic/aero/webapprt/downloads/downloads.css                  (downloads/downloads-aero.css)
-#endif
+% override chrome://webapprt/skin/downloads/downloadButtons.png     chrome://webapprt/skin/downloads/downloadButtons-XP.png  os=WINNT osversion<6
+% override chrome://webapprt/skin/downloads/downloadIcon.png        chrome://webapprt/skin/downloads/downloadIcon-XP.png     os=WINNT osversion<6