Bug 1150843 - Get rid of *-aero.css overrides except for browser-aero.css. r=gijs

browser/themes/windows/customizableui/panelUIOverlay-aero.css

@@ -1,7 +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/. */
-
-%define WINDOWS_AERO
-%include panelUIOverlay.css
-%undef WINDOWS_AERO

browser/themes/windows/customizableui/panelUIOverlay.css

@@ -129,24 +129,24 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
 
-%ifdef WINDOWS_AERO
 /* Win8 and beyond. */
-@media not all and (-moz-os-version: windows-vista) {
+@media not all and (-moz-os-version: windows-xp) {
-  @media not all and (-moz-os-version: windows-win7) {
+  @media not all and (-moz-os-version: windows-vista) {
-    panelview .toolbarbutton-1,
+    @media not all and (-moz-os-version: windows-win7) {
-    .subviewbutton,
+      panelview .toolbarbutton-1,
-    .widget-overflow-list .toolbarbutton-1,
+      .subviewbutton,
-    .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+      .widget-overflow-list .toolbarbutton-1,
-    #BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+      .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-    #edit-controls@inAnyPanel@,
+      #BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
-    #zoom-controls@inAnyPanel@,
+      #edit-controls@inAnyPanel@,
-    #edit-controls@inAnyPanel@ > toolbarbutton,
+      #zoom-controls@inAnyPanel@,
-    #zoom-controls@inAnyPanel@ > toolbarbutton {
+      #edit-controls@inAnyPanel@ > toolbarbutton,
-      border-radius: 0;
+      #zoom-controls@inAnyPanel@ > toolbarbutton {
+        border-radius: 0;
+      }
     }
   }
 }
-%endif
 
 @media not all and (-moz-windows-default-theme) {
   #edit-controls@inAnyPanel@ > #copy-button,

browser/themes/windows/devedition-aero.css

@@ -1,7 +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/.
-
-%define WINDOWS_AERO
-%include devedition.css
-%undef WINDOWS_AERO

browser/themes/windows/downloads/allDownloadsViewOverlay-aero.css

@@ -1,35 +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/. */
-
-%define WINDOWS_AERO
-%include allDownloadsViewOverlay.css
-%undef WINDOWS_AERO
-
-@media (-moz-windows-default-theme) {
-  /*
-  -moz-appearance: menuitem is almost right, but the hover effect is not
-  transparent and is lighter than desired.
-
-  Copied from the autocomplete richlistbox styling in
-  toolkit/themes/windows/global/autocomplete.css
-
-  This styling should be kept in sync with the style from the above file.
-  */
-  #downloadsRichListBox > richlistitem.download[selected] {
-    color: inherit;
-    background-color: transparent;
-    /* four gradients for the bevel highlights on each edge, one for blue background */
-    background-image:
-      linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px),
-      linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px),
-      linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px),
-      linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px),
-      linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3));
-    background-clip: content-box;
-    border-radius: 6px;
-    outline: 1px solid rgb(124,163,206);
-    -moz-outline-radius: 3px;
-    outline-offset: -2px;
-  }
-}

browser/themes/windows/downloads/allDownloadsViewOverlay.css

@@ -10,21 +10,27 @@
 
 #downloadsRichListBox > richlistitem.download {
   height: 6em;
-%ifndef WINDOWS_AERO
+}
-  padding: 5px 8px;
+
-%endif
+@media (-moz-os-version: windows-xp) {
+  #downloadsRichListBox > richlistitem.download {
+    padding: 5px 8px;
+  }
 }
 
 .downloadTypeIcon {
   -moz-margin-end: 8px;
-%ifdef WINDOWS_AERO
-  -moz-margin-start: 8px;
-%endif
   /* explicitly size the icon, so size doesn't vary on hidpi systems */
   height: 32px;
   width: 32px;
 }
 
+@media not all and (-moz-os-version: windows-xp) {
+  .downloadTypeIcon {
+    -moz-margin-start: 8px;
+  }
+}
+
 .blockedIcon {
   list-style-image: url("chrome://global/skin/icons/Error.png");
 }
@@ -105,56 +111,86 @@ richlistitem.download:hover > .downloadButton.downloadRetry:active {
   -moz-image-region: rect(32px, 64px, 48px, 48px);
 }
 
-%ifndef WINDOWS_AERO
+@media (-moz-os-version: windows-xp) {
-richlistitem.download[selected] > .downloadButton.downloadConfirmBlock,
+  richlistitem.download[selected] > .downloadButton.downloadConfirmBlock,
-richlistitem.download[selected] > .downloadButton.downloadCancel {
+  richlistitem.download[selected] > .downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 80px, 16px, 64px);
+    -moz-image-region: rect(0px, 80px, 16px, 64px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock,
+  richlistitem.download[selected]:hover > .downloadButton.downloadCancel {
+    -moz-image-region: rect(0px, 96px, 16px, 80px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:hover,
+  richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover {
+    -moz-image-region: rect(0px, 112px, 16px, 96px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:active,
+  richlistitem.download[selected]:hover > .downloadButton.downloadCancel:active {
+    -moz-image-region: rect(0px, 128px, 16px, 112px);
+  }
+
+  richlistitem.download[selected] > .downloadButton.downloadShow {
+    -moz-image-region: rect(16px, 80px, 32px, 64px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadShow {
+    -moz-image-region: rect(16px, 96px, 32px, 80px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadShow:hover {
+    -moz-image-region: rect(16px, 112px, 32px, 96px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadShow:active {
+    -moz-image-region: rect(16px, 128px, 32px, 112px);
+  }
+
+  richlistitem.download[selected] > .downloadButton.downloadRetry {
+    -moz-image-region: rect(32px, 80px, 48px, 64px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadRetry {
+    -moz-image-region: rect(32px, 96px, 48px, 80px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadRetry:hover {
+    -moz-image-region: rect(32px, 112px, 48px, 96px);
+  }
+
+  richlistitem.download[selected]:hover > .downloadButton.downloadRetry:active {
+    -moz-image-region: rect(32px, 128px, 48px, 112px);
+  }
 }
 
-richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock,
+@media not all and (-moz-os-version: windows-xp) {
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel {
+  @media (-moz-windows-default-theme) {
-  -moz-image-region: rect(0px, 96px, 16px, 80px);
+    /*
-}
+    -moz-appearance: menuitem is almost right, but the hover effect is not
+    transparent and is lighter than desired.
 
-richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:hover,
+    Copied from the autocomplete richlistbox styling in
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover {
+    toolkit/themes/windows/global/autocomplete.css
-  -moz-image-region: rect(0px, 112px, 16px, 96px);
-}
 
-richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:active,
+    This styling should be kept in sync with the style from the above file.
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel:active {
+    */
-  -moz-image-region: rect(0px, 128px, 16px, 112px);
+    #downloadsRichListBox > richlistitem.download[selected] {
+      color: inherit;
+      background-color: transparent;
+      /* four gradients for the bevel highlights on each edge, one for blue background */
+      background-image:
+        linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px),
+        linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px),
+        linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px),
+        linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px),
+        linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3));
+      background-clip: content-box;
+      border-radius: 6px;
+      outline: 1px solid rgb(124,163,206);
+      -moz-outline-radius: 3px;
+      outline-offset: -2px;
+    }
+  }
 }
-
-richlistitem.download[selected] > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 80px, 32px, 64px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-richlistitem.download[selected] > .downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 80px, 48px, 64px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 96px, 48px, 80px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry:hover {
-  -moz-image-region: rect(32px, 112px, 48px, 96px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry:active {
-  -moz-image-region: rect(32px, 128px, 48px, 112px);
-}
-%endif

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

@@ -1,23 +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/. */
-
-%define WINDOWS_AERO
-%include downloads.css
-%undef WINDOWS_AERO
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  richlistitem[type="download"] {
-    border: 1px solid transparent;
-    border-bottom: 1px solid hsl(213,40%,90%);
-  }
-
-  #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover {
-    border: 1px solid hsl(213,45%,65%);
-    box-shadow: 0 0 0 1px hsla(0,0%,100%,.5) inset,
-                0 1px 0 hsla(0,0%,100%,.3) inset;
-    background-image: linear-gradient(hsl(212,86%,92%), hsl(212,91%,86%));
-    color: black;
-  }
-}

browser/themes/windows/downloads/downloads.css

@@ -32,16 +32,13 @@
   cursor: pointer;
 }
 
-%ifdef WINDOWS_AERO
+@media (-moz-os-version: windows-xp),
-@media (-moz-os-version: windows-vista),
+       (-moz-os-version: windows-vista),
        (-moz-os-version: windows-win7) {
-%endif
+  #downloadsHistory {
-#downloadsHistory {
+    color: -moz-nativehyperlinktext;
-  color: -moz-nativehyperlinktext;
+  }
 }
-%ifdef WINDOWS_AERO
-}
-%endif
 
 #downloadsPanel[keyfocus] > #downloadsFooter > #downloadsHistory:focus {
   outline: 1px -moz-dialogtext dotted;
@@ -69,31 +66,32 @@
   box-shadow: 0 2px 0 0 hsla(210,4%,10%,.1) inset;
 }
 
-%ifdef WINDOWS_AERO
+@media (-moz-os-version: windows-xp),
-@media (-moz-os-version: windows-vista),
+       (-moz-os-version: windows-vista),
        (-moz-os-version: windows-win7) {
-%endif
+  @media (-moz-windows-default-theme) {
-@media (-moz-windows-default-theme) {
+    #downloadsFooter {
-  #downloadsFooter {
+      border-bottom-left-radius: 3px;
-    border-bottom-left-radius: 3px;
+      border-bottom-right-radius: 3px;
-    border-bottom-right-radius: 3px;
+      transition-duration: 0s;
-    transition-duration: 0s;
+    }
-  }
 
-  #downloadsFooter,
+    #downloadsFooter,
-  #downloadsFooter:hover,
+    #downloadsFooter:hover,
-  #downloadsFooter:hover:active {
+    #downloadsFooter:hover:active {
-%ifdef WINDOWS_AERO
+      background-color: #f1f5fb;
-    background-color: #f1f5fb;
+      box-shadow: 0px 1px 2px rgb(204,214,234) inset;
-%else
+    }
-    background-color: hsla(216,45%,88%,.98);
+
-%endif
+    @media (-moz-os-version: windows-xp) {
-    box-shadow: 0px 1px 2px rgb(204,214,234) inset;
+      #downloadsFooter,
+      #downloadsFooter:hover,
+      #downloadsFooter:hover:active {
+        background-color: hsla(216,45%,88%,.98);
+      }
+    }
   }
 }
-%ifdef WINDOWS_AERO
-}
-%endif
 
 /*** Downloads Summary and List items ***/
 
@@ -131,6 +129,14 @@ richlistitem[type="download"] {
   padding: 8px;
 }
 
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+  richlistitem[type="download"] {
+    border: 1px solid transparent;
+    border-bottom: 1px solid hsl(213,40%,90%);
+  }
+}
+
 richlistitem[type="download"]:first-child {
   border-top: 1px solid transparent;
 }
@@ -227,27 +233,35 @@ richlistitem[type="download"]:first-child {
   box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset;
 }
 
-%ifdef WINDOWS_AERO
+@media (-moz-os-version: windows-xp),
-@media (-moz-os-version: windows-vista),
+       (-moz-os-version: windows-vista),
        (-moz-os-version: windows-win7) {
-%endif
+  #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover {
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover {
+    border-radius: 3px;
-  border-radius: 3px;
+    outline: 0;
-  outline: 0;
+    border-top: 1px solid hsla(0,0%,100%,.2);
-  border-top: 1px solid hsla(0,0%,100%,.2);
+    border-bottom: 1px solid hsla(0,0%,0%,.2);
-  border-bottom: 1px solid hsla(0,0%,0%,.2);
+    background-color: Highlight;
-  background-color: Highlight;
+    color: HighlightText;
-  color: HighlightText;
+  }
+
+  #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover:active {
+    background-color: Highlight;
+    outline: 0;
+    box-shadow: none;
+  }
 }
 
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover:active {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-  background-color: Highlight;
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  outline: 0;
+  #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover {
-  box-shadow: none;
+    border: 1px solid hsl(213,45%,65%);
+    box-shadow: 0 0 0 1px hsla(0,0%,100%,.5) inset,
+                0 1px 0 hsla(0,0%,100%,.3) inset;
+    background-image: linear-gradient(hsl(212,86%,92%), hsl(212,91%,86%));
+    color: black;
+  }
 }
-%ifdef WINDOWS_AERO
-}
-%endif
 
 /*** Button icons ***/
 
@@ -280,26 +294,26 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:hover
 richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:active {
   -moz-image-region: rect(16px, 64px, 32px, 48px);
 }
-%ifndef WINDOWS_AERO
+@media (-moz-os-version: windows-xp) {
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
+  #downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+    -moz-image-region: rect(16px, 32px, 32px, 16px);
+  }
+  #downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
+    -moz-image-region: rect(16px, 48px, 32px, 32px);
+  }
+  #downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
+    -moz-image-region: rect(16px, 64px, 32px, 48px);
+  }
+  #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
+    -moz-image-region: rect(16px, 96px, 32px, 80px);
+  }
+  #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
+    -moz-image-region: rect(16px, 112px, 32px, 96px);
+  }
+  #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
+    -moz-image-region: rect(16px, 128px, 32px, 112px);
+  }
 }
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-%endif
 
 .downloadButton.downloadRetry {
   -moz-image-region: rect(32px, 16px, 48px, 0px);

browser/themes/windows/jar.mn

@@ -25,7 +25,6 @@ browser.jar:
 *       skin/classic/browser/browser.css
 *       skin/classic/browser/browser-aero.css
 *       skin/classic/browser/devedition.css
-*       skin/classic/browser/devedition-aero.css
 *       skin/classic/browser/browser-lightweightTheme.css
         skin/classic/browser/click-to-play-warning-stripes.png
         skin/classic/browser/content-contextmenu.svg
@@ -166,15 +165,13 @@ browser.jar:
         skin/classic/browser/customizableui/menuPanel-customizeFinish.png  (../shared/customizableui/menuPanel-customizeFinish.png)
         skin/classic/browser/customizableui/panelarrow-customizeTip.png  (../shared/customizableui/panelarrow-customizeTip.png)
 *       skin/classic/browser/customizableui/panelUIOverlay.css       (customizableui/panelUIOverlay.css)
-*       skin/classic/browser/customizableui/panelUIOverlay-aero.css  (customizableui/panelUIOverlay-aero.css)
         skin/classic/browser/customizableui/subView-arrow-back-inverted.png  (../shared/customizableui/subView-arrow-back-inverted.png)
         skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl.png  (../shared/customizableui/subView-arrow-back-inverted-rtl.png)
         skin/classic/browser/customizableui/whimsy.png  (../shared/customizableui/whimsy.png)
         skin/classic/browser/customizableui/whimsy@2x.png  (../shared/customizableui/whimsy@2x.png)
         skin/classic/browser/customizableui/whimsy-bw.png  (../shared/customizableui/whimsy-bw.png)
         skin/classic/browser/customizableui/whimsy-bw@2x.png  (../shared/customizableui/whimsy-bw@2x.png)
-*       skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
+        skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
-*       skin/classic/browser/downloads/allDownloadsViewOverlay-aero.css (downloads/allDownloadsViewOverlay-aero.css)
         skin/classic/browser/downloads/buttons.png                   (downloads/buttons.png)
         skin/classic/browser/downloads/buttons-aero.png              (downloads/buttons-aero.png)
         skin/classic/browser/downloads/contentAreaDownloadsView.css  (downloads/contentAreaDownloadsView.css)
@@ -182,8 +179,7 @@ browser.jar:
         skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
         skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
         skin/classic/browser/downloads/download-summary.png          (downloads/download-summary.png)
-*       skin/classic/browser/downloads/downloads.css                 (downloads/downloads.css)
+        skin/classic/browser/downloads/downloads.css                 (downloads/downloads.css)
-*       skin/classic/browser/downloads/downloads-aero.css            (downloads/downloads-aero.css)
         skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
         skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
         skin/classic/browser/feeds/feedIcon-aero.png                 (feeds/feedIcon-aero.png)
@@ -196,9 +192,7 @@ browser.jar:
         skin/classic/browser/panic-panel/header-small.png            (../shared/panic-panel/header-small.png)
         skin/classic/browser/panic-panel/icons.png                   (../shared/panic-panel/icons.png)
         skin/classic/browser/places/places.css                       (places/places.css)
-*       skin/classic/browser/places/places-aero.css                  (places/places-aero.css)
 *       skin/classic/browser/places/organizer.css                    (places/organizer.css)
-*       skin/classic/browser/places/organizer-aero.css               (places/organizer-aero.css)
         skin/classic/browser/places/bookmark.png                     (places/bookmark.png)
         skin/classic/browser/places/bookmark-aero.png                (places/bookmark-aero.png)
         skin/classic/browser/places/query.png                        (places/query.png)
@@ -531,7 +525,6 @@ browser.jar:
 % override chrome://browser/skin/aboutSessionRestore-window-icon.png  chrome://browser/skin/aboutSessionRestore-window-icon-aero.png    os=WINNT osversion>=6
 
 % override chrome://browser/skin/browser.css                          chrome://browser/skin/browser-aero.css                            os=WINNT osversion>=6
-% override chrome://browser/skin/devedition.css                       chrome://browser/skin/devedition-aero.css                         os=WINNT osversion>=6
 % override chrome://browser/skin/Info.png                             chrome://browser/skin/Info-aero.png                               os=WINNT osversion>=6
 % override chrome://browser/skin/identity.png                         chrome://browser/skin/identity-aero.png                           os=WINNT osversion>=6
 % override chrome://browser/skin/livemark-folder.png                  chrome://browser/skin/livemark-folder-aero.png                    os=WINNT osversion>=6
@@ -542,14 +535,9 @@ browser.jar:
 % override chrome://browser/skin/Privacy-32.png                       chrome://browser/skin/Privacy-32-aero.png                         os=WINNT osversion>=6
 % override chrome://browser/skin/searchbar-dropdown-arrow.png         chrome://browser/skin/searchbar-dropdown-arrow-aero.png           os=WINNT osversion>=6
 % override chrome://browser/skin/Secure24.png                         chrome://browser/skin/Secure24-aero.png                           os=WINNT osversion>=6
-% override chrome://browser/skin/customizableui/panelUIOverlay.css    chrome://browser/skin/customizableui/panelUIOverlay-aero.css      os=WINNT osversion>=6
-% override chrome://browser/skin/downloads/allDownloadsViewOverlay.css  chrome://browser/skin/downloads/allDownloadsViewOverlay-aero.css  os=WINNT osversion>=6
 % override chrome://browser/skin/downloads/buttons.png                chrome://browser/skin/downloads/buttons-aero.png                  os=WINNT osversion>=6
-% override chrome://browser/skin/downloads/downloads.css              chrome://browser/skin/downloads/downloads-aero.css                os=WINNT osversion>=6
 % override chrome://browser/skin/feeds/feedIcon.png                   chrome://browser/skin/feeds/feedIcon-aero.png                     os=WINNT osversion>=6
 % override chrome://browser/skin/feeds/feedIcon16.png                 chrome://browser/skin/feeds/feedIcon16-aero.png                   os=WINNT osversion>=6
-% override chrome://browser/skin/places/places.css                    chrome://browser/skin/places/places-aero.css                      os=WINNT osversion>=6
-% override chrome://browser/skin/places/organizer.css                 chrome://browser/skin/places/organizer-aero.css                   os=WINNT osversion>=6
 % override chrome://browser/skin/places/bookmark.png                  chrome://browser/skin/places/bookmark-aero.png                    os=WINNT osversion>=6
 % override chrome://browser/skin/places/query.png                     chrome://browser/skin/places/query-aero.png                       os=WINNT osversion>=6
 % override chrome://browser/skin/places/bookmarksMenu.png             chrome://browser/skin/places/bookmarksMenu-aero.png               os=WINNT osversion>=6

browser/themes/windows/places/organizer-aero.css

@@ -1,77 +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/. */
-
-%define WINDOWS_AERO
-%include ../windowsShared.inc
-%include organizer.css
-%undef WINDOWS_AERO
-
-%filter substitution
-
-#placesView {
-  border-top: none;
-}
-
-@media not all and (-moz-windows-classic) {
-  #placesToolbox {
-    -moz-appearance: none;
-    background-color: transparent;
-  }
-
-  #placesToolbar {
-    -moz-appearance: none;
-    background-color: -moz-Dialog;
-    color: -moz-dialogText;
-  }
-}
-
-@media (-moz-windows-compositor) {
-  #placesToolbox {
-    border-top: none;
-  }
-
-  #placesToolbar {
-    background-image: linear-gradient(@toolbarHighlight@, transparent);
-  }
-}
-
-@media (-moz-windows-default-theme) {
-  #placesView > splitter {
-    border: 0;
-    -moz-border-end: 1px solid #A9B7C9;
-    min-width: 0;
-    width: 3px;
-    background-color: transparent;
-    -moz-margin-start: -3px;
-    position: relative;
-  }
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  #placesView,
-  #infoPane,
-  #placesList,
-  #placeContent {
-    background-color: #EEF3FA;
-  }
-
-  #placesToolbar {
-    background-color: @customToolbarColor@;
-    color: black;
-  }
-
-  #detailsDeck {
-    border-top-color: #A9B7C9;
-  }
-
-  #searchFilter {
-    -moz-appearance: none;
-    padding: 2px;
-    -moz-padding-start: 4px;
-    background-clip: padding-box;
-    border: 1px solid rgba(0,0,0,.32);
-    border-radius: 2px;
-  }
-}

browser/themes/windows/places/organizer.css

@@ -2,6 +2,9 @@
  * 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 ../windowsShared.inc
+%filter substitution
+
 /* Toolbar */
 #placesToolbar {
   padding: 3px;
@@ -17,14 +20,12 @@
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-%ifndef WINDOWS_AERO
 @media (-moz-windows-theme: luna-silver) {
   #back-button,
   #forward-button {
     list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png");
   }
 }
-%endif
 
 #back-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
@@ -149,3 +150,73 @@
   -moz-padding-start: 9px;
   -moz-padding-end: 9px;
 }
+
+
+@media not all and (-moz-os-version: windows-xp) {
+  #placesView {
+    border-top: none;
+  }
+
+  @media not all and (-moz-windows-classic) {
+    #placesToolbox {
+      -moz-appearance: none;
+      background-color: transparent;
+    }
+
+    #placesToolbar {
+      -moz-appearance: none;
+      background-color: -moz-Dialog;
+      color: -moz-dialogText;
+    }
+  }
+
+  @media (-moz-windows-default-theme) {
+    #placesView > splitter {
+      border: 0;
+      -moz-border-end: 1px solid #A9B7C9;
+      min-width: 0;
+      width: 3px;
+      background-color: transparent;
+      -moz-margin-start: -3px;
+      position: relative;
+    }
+  }
+}
+
+@media (-moz-windows-compositor) {
+  #placesToolbox {
+    border-top: none;
+  }
+
+  #placesToolbar {
+    background-image: linear-gradient(@toolbarHighlight@, transparent);
+  }
+}
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+  #placesView,
+  #infoPane,
+  #placesList,
+  #placeContent {
+    background-color: #EEF3FA;
+  }
+
+  #placesToolbar {
+    background-color: @customToolbarColor@;
+    color: black;
+  }
+
+  #detailsDeck {
+    border-top-color: #A9B7C9;
+  }
+
+  #searchFilter {
+    -moz-appearance: none;
+    padding: 2px;
+    -moz-padding-start: 4px;
+    background-clip: padding-box;
+    border: 1px solid rgba(0,0,0,.32);
+    border-radius: 2px;
+  }
+}

browser/themes/windows/places/places-aero.css

@@ -1,22 +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 places.css
-
-/* Style Places sidebars as Vista media collection */
-@media (-moz-windows-default-theme) {
-  #bookmarksPanel,
-  #history-panel {
-    background-color: #EEF3FA;
-  }
-
-  .sidebar-placesTree {
-    background-color: transparent;
-    border-top: none;
-  }
-
-  .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) {
-    text-decoration: none;
-  }
-}

browser/themes/windows/places/places.css

@@ -24,6 +24,25 @@
   cursor: default;
 }
 
+/* Style Places sidebars as Vista media collection */
+@media not all and (-moz-os-version: windows-xp) {
+  @media (-moz-windows-default-theme) {
+    #bookmarksPanel,
+    #history-panel {
+      background-color: #EEF3FA;
+    }
+
+    .sidebar-placesTree {
+      background-color: transparent;
+      border-top: none;
+    }
+
+    .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) {
+      text-decoration: none;
+    }
+  }
+}
+
 /* Trees */
 treechildren::-moz-tree-image(title) {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");