Show an extra privacy warning on Win8

BUG=141723
TEST=Make sure the Win8 privacy warning is shown in the advances settings UI, but ONLY when running on Win8.


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152333 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/generated_resources.grd

@@ -10923,15 +10923,11 @@ The following application will be launched if you accept this request:
       <message name="IDS_OPTIONS_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging">
         Automatically send usage statistics and crash reports to Google
       </message>
-      <message name="IDS_WINDOWS8_PRIVACY_HANDLING_INFO" desc="The text which describes how user data is handled differently in Windows8">
-        Your data is handled differently in Windows 8.
-        <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">
-          &lt;/a&gt;<ex>&lt;/a&gt;</ex>
-        </ph>.
-      </message>
-      <message name="IDS_WINDOWS8_PRIVACY_HANDLING_INFO_URL" desc="URL of help center page describing how user data is handled differently in Windows8">
-        "https://support.google.com/chrome/?p=win8_directories"
-      </message>
+      <if expr="is_win">
+        <message name="IDS_WINDOWS8_PRIVACY_HANDLING_INFO" desc="The text which describes how user data is handled differently in Windows8">
+          Your data is handled differently in Windows 8.
+        </message>
+      </if>
       <message name="IDS_OPTIONS_TABS_TO_LINKS_PREF" desc="The documentation string of the 'Tabs to Links' preference">
         Pressing Tab on a webpage highlights links, as well as form fields
       </message>

chrome/browser/resources/options/browser_options.html

@@ -193,6 +193,13 @@
   <section>
     <h3 i18n-content="advancedSectionTitlePrivacy"></h3>
     <div>
+<if expr="is_win">
+      <div id="privacy-win8-data-settings" class="settings-row" hidden>
+        <span i18n-content="privacyWin8Data"></span>
+        <a target="_blank" i18n-content="learnMore"
+            i18n-values="href:privacyWin8DataLearnMoreURL"></a>
+      </div>
+</if>
       <div class="settings-row">
         <button id="privacyContentSettingsButton"
             i18n-content="privacyContentSettingsButton"></button>

chrome/browser/resources/options/browser_options.js

@@ -245,6 +245,11 @@ cr.define('options', function() {
       }
 
       // Privacy section.
+      var winVerMatch = /Windows NT (\d+(?:\.\d+))?/.exec(navigator.userAgent);
+      var isWin8 = winVerMatch && winVerMatch[1] >= 6.2;
+      var win8Element = $('privacy-win8-data-settings');
+      if (win8Element)
+        win8Element.hidden = !isWin8;
       $('privacyContentSettingsButton').onclick = function(event) {
         OptionsPage.navigateToPage('content');
         OptionsPage.showTab($('cookies-nav-tab'));

chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -225,6 +225,9 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
     { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
     { "privacyContentSettingsButton",
       IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
+#if defined(OS_WIN)
+    { "privacyWin8Data", IDS_WINDOWS8_PRIVACY_HANDLING_INFO },
+#endif
     { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL },
     { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL },
     { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
@@ -370,6 +373,10 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
   // Pass along sync status early so it will be available during page init.
   values->Set("syncData", GetSyncStateDictionary().release());
 
+#if defined(OS_WIN)
+  values->SetString("privacyWin8DataLearnMoreURL",
+                    chrome::kPrivacyWin8DataLearnMoreURL);
+#endif
   values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
   values->SetString("sessionRestoreLearnMoreURL",
                     chrome::kSessionRestoreLearnMoreURL);

chrome/common/url_constants.cc

@@ -407,6 +407,11 @@ const char kKillReasonURL[] =
     "https://support.google.com/chrome/?p=e_deadjim";
 #endif
 
+#if defined(OS_WIN)
+const char kPrivacyWin8DataLearnMoreURL[] =
+    "https://support.google.com/chrome/?p=win8_directories";
+#endif
+
 const char kPrivacyLearnMoreURL[] =
 #if defined(OS_CHROMEOS)
     "https://support.google.com/chromeos/?p=settings_privacy";

chrome/common/url_constants.h

@@ -324,6 +324,11 @@ extern const char kCrashReasonURL[];
 // "Learn more" URL for killed tab page.
 extern const char kKillReasonURL[];
 
+#if defined(OS_WIN)
+// "Learn more" URL for the Win8 Data Privacy section under Options.
+extern const char kPrivacyWin8DataLearnMoreURL[];
+#endif
+
 // "Learn more" URL for the Privacy section under Options.
 extern const char kPrivacyLearnMoreURL[];