Merge 158323 - Update the DNT preference interstitial string

BUG=151894


Review URL: https://chromiumcodereview.appspot.com/10961073

TBR=battre@chromium.org
Review URL: https://codereview.chromium.org/10960059

git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@158330 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 17 insertions, 2 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index b1310de..23807e7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11321,7 +11321,7 @@ The following application will be launched if you accept this request:
         Send a ‘Do Not Track’ request with your browsing traffic
       </message>
       <message name="IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT" desc="The text of a confirmation dialog that confirms that the user want to send the 'Do Not Track' header">
-        This feature is currently under development.
+        Enabling ‘Do Not Track’ means that a request will be included with your browsing traffic. Any effect depends on whether a website responds to the request, and how the request is interpreted. For example, some websites may respond to this request by showing you ads that aren't based on other websites you've visited. Many websites will still collect and use your browsing data - for example to improve security, to provide content, services, ads and recommendations on their websites, and to generate reporting statistics.
       </message>
       <message name="IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE" desc="The title of a confirmation dialog that confirms that the user want to send the 'Do Not Track' header">
         Do Not Track
diff --git a/chrome/browser/resources/options/do_not_track_confirm_overlay.html b/chrome/browser/resources/options/do_not_track_confirm_overlay.html
index 725fb45..650f1aa 100644
--- a/chrome/browser/resources/options/do_not_track_confirm_overlay.html
+++ b/chrome/browser/resources/options/do_not_track_confirm_overlay.html
@@ -5,6 +5,9 @@
     <span id="do-not-track-confirm-text"
         i18n-content="doNotTrackConfirmMessage">
     </span>
+    <a target="_blank" i18n-content="learnMore"
+        i18n-values="href:doNotTrackLearnMoreURL">
+    </a>
   </div>
   <div class="action-area">
     <div class="button-strip">
@@ -13,7 +16,8 @@
       </button>
       <button id="do-not-track-confirm-cancel"
           i18n-content="doNotTrackConfirmDisable"
-          class="cancel-button"></button>
+          class="cancel-button">
+      </button>
     </div>
   </div>
 </div>
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 0de2f6f..2bde7d3 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -387,6 +387,7 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
   values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
   values->SetString("sessionRestoreLearnMoreURL",
                     chrome::kSessionRestoreLearnMoreURL);
+  values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL);
 
   values->SetString(
       "languageSectionLabel",
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 43b84df..127ba9e 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -425,6 +425,13 @@ const char kPrivacyLearnMoreURL[] =
     "https://support.google.com/chrome/?p=settings_privacy";
 #endif
 
+const char kDoNotTrackLearnMoreURL[] =
+#if defined(OS_CHROMEOS)
+    "https://support.google.com/chromeos/?p=settings_do_not_track";
+#else
+    "https://support.google.com/chrome/?p=settings_do_not_track";
+#endif
+
 const char kSessionRestoreLearnMoreURL[] =
     "https://support.google.com/chrome/?p=settings_reopen_pages";
 
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 69bbace..0688c5f 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -337,6 +337,9 @@ extern const char kPrivacyWin8DataLearnMoreURL[];
 // "Learn more" URL for the Privacy section under Options.
 extern const char kPrivacyLearnMoreURL[];
 
+// "Learn more" URL for the "Do not track" setting in the privacy section.
+extern const char kDoNotTrackLearnMoreURL[];
+
 // "Learn more" URL for the Continue where I left off startup option under
 // Options.
 extern const char kSessionRestoreLearnMoreURL[];