#60160

r=blake, sr=alecf
Remove Win32 specific code for system colors - make it XP using nsLookAndFeel

suite/common/pref/pref-colors.xul

@@ -61,7 +61,10 @@
         <data id="background" pref="true" preftype="color" prefstring="browser.display.background_color" prefattribute="value" wsm_attributes="value"/>
       </box>
       <separator class="thin"/>
-      <box autostretch="never" id="useWindowsColoursBox"/>
+      <box autostretch="never" id="useSystemColoursBox">
+        <checkbox id="browserUseSystemColors" value="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
+                pref="true" preftype="bool" prefstring="browser.display.use_system_colors" prefattribute="checked"/>
+      </box>
     </titledbox>
       
     <titledbox orient="vertical" flex="1">

suite/common/pref/win/platformPrefOverlay.xul

@@ -28,19 +28,6 @@
 <overlay id="platformPreferencesOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
-  <![CDATA[
-    _elementIDs.push("browserUseWindowsColors");
-  ]]>
-  </script>         
-
-  <!-- "Use Windows Colours" checkbox on colours panel applies only
-       to Windows! -->         
-  <box id="useWindowsColoursBox">
-    <checkbox id="browserUseWindowsColors" value="&useWindowsColors.label;" accesskey="&useWindowsColors.accesskey;"
-            pref="true" preftype="bool" prefstring="browser.display.wfe.use_windows_colors" prefattribute="checked"/>
-  </box>
-
   <!-- Windows integration is (obviously) only applicable on Windows. -->
   <treechildren id="advancedChildren">
     <treeitem id="winhooks">

suite/locales/en-US/chrome/common/pref/pref-colors.dtd

@@ -8,6 +8,8 @@
 <!ENTITY  textColor.accesskey             "t">
 <!ENTITY  backgroundColor.label           "Background:">
 <!ENTITY  backgroundColor.accesskey       "b">
+<!ENTITY  useWindowsColors.label          "Use system colors">
+<!ENTITY  useWindowsColors.accesskey      "s">
 
 <!ENTITY  underlineLinks.label            "Underline links">
 <!ENTITY  underlineLinks.accesskey        "u">

suite/locales/en-US/chrome/common/pref/win/platformPrefOverlay.dtd

@@ -1,4 +1,2 @@
-<!ENTITY  useWindowsColors.label          "Use Windows colors">
-<!ENTITY  useWindowsColors.accesskey      "w">
 <!ENTITY winhooks.label                   "Windows Integration">