From c2e781d76126fed594f0b811f84a6467c9e10392 Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 8 Jan 2016 14:11:38 +0000
Subject: [PATCH] Bug 1231375 - Add a dialog to manage DNT settings. r=past

---
 browser/components/preferences/donottrack.xul | 35 +++++++++++++++++++
 .../preferences/in-content/privacy.js         | 12 +++++++
 .../preferences/in-content/privacy.xul        | 21 +++--------
 browser/components/preferences/jar.mn         |  1 +
 .../chrome/browser/preferences/donottrack.dtd | 12 +++++++
 .../chrome/browser/preferences/privacy.dtd    |  9 +++--
 browser/locales/jar.mn                        |  1 +
 .../shared/incontentprefs/preferences.inc.css |  2 +-
 8 files changed, 73 insertions(+), 20 deletions(-)
 create mode 100644 browser/components/preferences/donottrack.xul
 create mode 100644 browser/locales/en-US/chrome/browser/preferences/donottrack.dtd

diff --git a/browser/components/preferences/donottrack.xul b/browser/components/preferences/donottrack.xul
new file mode 100644
index 0000000000000..40f0aacebbea7
--- /dev/null
+++ b/browser/components/preferences/donottrack.xul
@@ -0,0 +1,35 @@
+<?xml version="1.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/. -->
+
+<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+
+<!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/donottrack.dtd" >
+
+<prefwindow id="DoNotTrackDialog" type="child"
+            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+            xmlns:html="http://www.w3.org/1999/xhtml"
+            title="&window.title;"
+            style="width: &window.width;; height: &window.height;;"
+            dlgbuttons="accept,cancel">
+  <prefpane>
+    <preferences>
+      <preference id="privacy.donottrackheader.enabled"
+                  name="privacy.donottrackheader.enabled"
+                  type="bool"/>
+    </preferences>
+    <hbox align="center" pack="start">
+      <!-- Work around focus ring not showing properly. -->
+      <spacer style="width: 1em;"/>
+      <checkbox label="&doNotTrackCheckbox.label;"
+                accesskey="&doNotTrackCheckbox.accesskey;"
+                preference="privacy.donottrackheader.enabled"/>
+      <label class="text-link doNotTrackLearnMore"
+             value="&doNotTrackLearnMore.label;"
+             href="https://www.mozilla.org/dnt"/>
+    </hbox>
+  </prefpane>
+</prefwindow>
diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js
index 3ec0afe9c27a0..ac48c5152bdee 100644
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -108,6 +108,10 @@ var gPrivacyPane = {
       gPrivacyPane.clearPrivateDataNow(true);
       return false;
     });
+    setEventListener("doNotTrackSettings", "click", function () {
+      gPrivacyPane.showDoNotTrackSettings();
+      return false;
+    });
     setEventListener("privateBrowsingAutoStart", "command",
                      gPrivacyPane.updateAutostart);
     setEventListener("cookieExceptions", "command",
@@ -386,6 +390,14 @@ var gPrivacyPane = {
                     null, params);
   },
 
+  /**
+   * Displays the Do Not Track settings dialog.
+   */
+  showDoNotTrackSettings() {
+    gSubDialog.open("chrome://browser/content/preferences/donottrack.xul",
+                    "resizable=no");
+  },
+
   // HISTORY
 
   /*
diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
index beb1800d28915..6812b825de3fd 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -10,9 +10,6 @@
 <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy">
 
   <!-- Tracking -->
-  <preference id="privacy.donottrackheader.enabled"
-              name="privacy.donottrackheader.enabled"
-              type="bool"/>
   <preference id="privacy.trackingprotection.enabled"
               name="privacy.trackingprotection.enabled"
               type="bool"/>
@@ -88,19 +85,6 @@
 <!-- Tracking -->
 <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true">
   <caption><label>&tracking.label;</label></caption>
-  <vbox>
-    <hbox align="center">
-      <checkbox id="privacyDoNotTrackCheckbox"
-                label="&dntTrackingNotOkay4.label;"
-                accesskey="&dntTrackingNotOkay4.accesskey;"
-                preference="privacy.donottrackheader.enabled"/>
-      <label id="doNotTrackInfo"
-             class="text-link"
-             href="https://www.mozilla.org/dnt">
-        &doNotTrackInfo.label;
-      </label>
-    </hbox>
-  </vbox>
   <vbox id="trackingprotectionbox" hidden="true">
     <hbox align="center">
       <checkbox id="trackingProtection"
@@ -127,6 +111,11 @@
               preference="pref.privacy.disable_button.change_blocklist"/>
     </hbox>
   </vbox>
+  <vbox>
+    <description>&doNotTrack.pre.label;<html:a
+    class="inline-link" id="doNotTrackSettings" href="#"
+    >&doNotTrack.settings.label;</html:a>&doNotTrack.post.label;</description>
+  </vbox>
 </groupbox>
 
 <!-- History -->
diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
index c0216394ef8c3..20fa9db41f987 100644
--- a/browser/components/preferences/jar.mn
+++ b/browser/components/preferences/jar.mn
@@ -12,6 +12,7 @@ browser.jar:
 *   content/browser/preferences/cookies.js
 *   content/browser/preferences/connection.xul
     content/browser/preferences/connection.js
+    content/browser/preferences/donottrack.xul
 *   content/browser/preferences/fonts.xul
     content/browser/preferences/fonts.js
     content/browser/preferences/handlers.xml
diff --git a/browser/locales/en-US/chrome/browser/preferences/donottrack.dtd b/browser/locales/en-US/chrome/browser/preferences/donottrack.dtd
new file mode 100644
index 0000000000000..28d31478da852
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/preferences/donottrack.dtd
@@ -0,0 +1,12 @@
+<!-- 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/. -->
+
+<!ENTITY window.title                 "Do Not Track">
+<!ENTITY window.width                 "40em">
+<!ENTITY window.height                "8em">
+
+<!ENTITY doNotTrackCheckbox.label     "Use Do Not Track">
+<!ENTITY doNotTrackCheckbox.accesskey "U">
+
+<!ENTITY doNotTrackLearnMore.label    "Learn More">
diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
index cb2dce6e8e6f7..1589b729a0d8e 100644
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -4,9 +4,6 @@
 
 <!ENTITY tracking.label                 "Tracking">
 
-<!ENTITY dntTrackingNotOkay4.label     "Request that sites not track you">
-<!ENTITY dntTrackingNotOkay4.accesskey "n">
-<!ENTITY doNotTrackInfo.label          "Learn More">
 <!ENTITY trackingProtection5.label     "Use Tracking Protection">
 <!ENTITY trackingProtection5.accesskey "i">
 <!ENTITY trackingProtectionLearnMore.label "Learn more">
@@ -16,6 +13,12 @@
 <!ENTITY changeBlockList.label          "Change Block List">
 <!ENTITY changeBlockList.accesskey      "C">
 
+<!-- LOCALIZATION NOTE (doNotTrack.pre.label): include a trailing space as needed -->
+<!-- LOCALIZATION NOTE (doNotTrack.post.label): include a starting space as needed -->
+<!ENTITY  doNotTrack.pre.label          "You can also ">
+<!ENTITY  doNotTrack.settings.label     "manage your Do Not Track settings">
+<!ENTITY  doNotTrack.post.label         ".">
+
 <!ENTITY  history.label                 "History">
 
 <!ENTITY  locationBar.label             "Location Bar">
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 4d009043bc951..fd5153be82de8 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -70,6 +70,7 @@
     locale/browser/preferences/cookies.dtd            (%chrome/browser/preferences/cookies.dtd)
     locale/browser/preferences/content.dtd            (%chrome/browser/preferences/content.dtd)
     locale/browser/preferences/connection.dtd         (%chrome/browser/preferences/connection.dtd)
+    locale/browser/preferences/donottrack.dtd         (%chrome/browser/preferences/donottrack.dtd)
     locale/browser/preferences/applications.dtd       (%chrome/browser/preferences/applications.dtd)
     locale/browser/preferences/fonts.dtd              (%chrome/browser/preferences/fonts.dtd)
     locale/browser/preferences/main.dtd               (%chrome/browser/preferences/main.dtd)
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index 16321bbf0f041..a8333048b99f0 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -222,7 +222,7 @@ treecol {
 
 /* Privacy pane */
 
-#doNotTrackInfo,
+.doNotTrackLearnMore,
 #trackingProtectionPBMLearnMore,
 #trackingProtectionLearnMore {
   -moz-margin-start: 1.5em !important;