Bug 1367712 - Stop using a custom toolbar background color on Windows 7. r=nhnt11

MozReview-Commit-ID: 61hkb0KAYeq

--HG--
extra : rebase_source : 27829f891336668bec472a888d961968f5896d0d

browser/themes/shared/tab-selected.svg

@@ -19,13 +19,14 @@
         height: 100%;
         width: 100%;
       }
+%ifndef MOZ_PHOTON_THEME
 %ifdef XP_WIN
-      @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-             (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+      @media (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
         #tab-background-fill {
           background-color: @customToolbarColor@;
         }
       }
+%endif
 %endif
     </style>
 %include ../../base/content/tab-shape.inc.svg

browser/themes/windows/browser-aero.css

@@ -22,18 +22,16 @@
   .menu-iconic-accel {
     color: graytext;
   }
-
+%ifndef MOZ_PHOTON_THEME
   @media (-moz-os-version: windows-win7) {
     #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme),
     #browser-bottombox:not(:-moz-lwtheme),
-    .browserContainer > findbar {
-      background-color: @customToolbarColor@;
-    }
-
+    .browserContainer > findbar,
     .tab-background-middle[selected=true]:not(:-moz-lwtheme) {
       background-color: @customToolbarColor@;
     }
   }
+%endif
 }
 
 @media (-moz-windows-compositor) {

browser/themes/windows/places/organizer.css

@@ -184,11 +184,12 @@
     background-color: #EEF3FA;
   }
 
+%ifndef MOZ_PHOTON_THEME
   #placesToolbar {
     background-color: @customToolbarColor@;
     color: black;
   }
-
+%endif
   #detailsDeck {
     border-top-color: #A9B7C9;
   }

browser/themes/windows/windowsShared.inc

@@ -8,4 +8,6 @@
 %define fgTabTexture linear-gradient(transparent 2px, @toolbarHighlight@ 2px, @toolbarHighlight@)
 %define fgTabBackgroundColor -moz-dialog
 %define fgTabTextureLWT @fgTabTexture@
+%ifndef MOZ_PHOTON_THEME
 %define customToolbarColor hsl(210,75%,92%)
+%endif