From 8a9e5f2c367fc3f095c061c78d55a6135146e7fb Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 27 Nov 2014 19:12:03 +0000
Subject: [PATCH] Bug 639134 - update pref UI and internet explorer profile
 migration code for new tristate pref, r=jaws

---
 .../components/migration/IEProfileMigrator.js  |  4 ++--
 browser/components/preferences/colors.xul      | 18 ++++++++++++------
 .../chrome/browser/preferences/colors.dtd      |  8 ++++++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/browser/components/migration/IEProfileMigrator.js b/browser/components/migration/IEProfileMigrator.js
index dcfe1b8ed393..a16cf5a6366e 100644
--- a/browser/components/migration/IEProfileMigrator.js
+++ b/browser/components/migration/IEProfileMigrator.js
@@ -531,8 +531,8 @@ Settings.prototype = {
               yesNoToBoolean);
     this._set("Software\\Microsoft\\Internet Explorer\\Settings",
               "Always Use My Colors",
-              "browser.display.use_document_colors",
-              function (v) !Boolean(v));
+              "browser.display.document_color_use",
+              function (v) !Boolean(v) ? 0 : 2);
     this._set("Software\\Microsoft\\Internet Explorer\\Settings",
               "Always Use My Font Face",
               "browser.display.use_document_fonts",
diff --git a/browser/components/preferences/colors.xul b/browser/components/preferences/colors.xul
index 6d09f86e257b..50d8c2e50c08 100644
--- a/browser/components/preferences/colors.xul
+++ b/browser/components/preferences/colors.xul
@@ -28,7 +28,7 @@
             helpTopic="prefs-fonts-and-colors">
   
     <preferences>
-      <preference id="browser.display.use_document_colors"  name="browser.display.use_document_colors"  type="bool"/>
+      <preference id="browser.display.document_color_use"   name="browser.display.document_color_use"   type="int"/>
       <preference id="browser.anchor_color"                 name="browser.anchor_color"                 type="string"/>
       <preference id="browser.visited_color"                name="browser.visited_color"                type="string"/>
       <preference id="browser.underline_anchors"            name="browser.underline_anchors"            type="bool"/>
@@ -80,10 +80,16 @@
         </hbox>
       </groupbox>
     </hbox>
-    <hbox>
-      <checkbox id="useDocumentColors" 
-                label="&allowPagesToUse.label;" accesskey="&allowPagesToUse.accesskey;"
-                preference="browser.display.use_document_colors" flex="1"/>
-    </hbox>
+    <vbox align="start">
+      <label accesskey="&allowPagesToUseColors.accesskey;"
+             control="useDocumentColors">&allowPagesToUseColors.label;</label>
+      <menulist id="useDocumentColors" preference="browser.display.document_color_use">
+        <menupopup>
+          <menuitem label="&allowPagesToUseColors.automatic.label;" value="0" id="documentColorAutomatic"/>
+          <menuitem label="&allowPagesToUseColors.always.label;"    value="1" id="documentColorAlways"/>
+          <menuitem label="&allowPagesToUseColors.never.label;"     value="2" id="documentColorNever"/>
+        </menupopup>
+      </menulist>
+    </vbox>
   </prefpane>
 </prefwindow>
diff --git a/browser/locales/en-US/chrome/browser/preferences/colors.dtd b/browser/locales/en-US/chrome/browser/preferences/colors.dtd
index 4063ce7c6ea8..81698ae33326 100644
--- a/browser/locales/en-US/chrome/browser/preferences/colors.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/colors.dtd
@@ -6,8 +6,12 @@
 <!ENTITY  window.width                    "38em">
 <!ENTITY  window.macWidth                 "41em">
 
-<!ENTITY  allowPagesToUse.label           "Allow pages to choose their own colors, instead of my selections above">
-<!ENTITY  allowPagesToUse.accesskey       "A">
+<!ENTITY  allowPagesToUseColors.label           "Allow pages to choose their own colors, instead of my selections above:">
+<!ENTITY  allowPagesToUseColors.accesskey       "A">
+
+<!ENTITY  allowPagesToUseColors.automatic.label "Automatic">
+<!ENTITY  allowPagesToUseColors.always.label    "Always">
+<!ENTITY  allowPagesToUseColors.never.label     "Never">
 
 <!ENTITY  color                           "Text and Background">
 <!ENTITY  textColor.label                 "Text:">