Index: chrome/browser/ui/webui/options2/browser_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler.cc b/chrome/browser/ui/webui/options2/browser_options_handler.cc |
index 7b84554fd6e3e5c0519e06d6dfefda84d62f818d..05b174e28037ef945fde9f8e67cc015851656394 100644 |
--- a/chrome/browser/ui/webui/options2/browser_options_handler.cc |
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.cc |
@@ -92,6 +92,7 @@ |
#endif // defined(OS_CHROMEOS) |
#if defined(OS_WIN) |
+#include "base/win/windows_version.h" |
#include "chrome/installer/util/auto_launch_util.h" |
#endif // defined(OS_WIN) |
@@ -225,6 +226,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_OPTIONS_PRIVACY_WIN8_DATA }, |
+#endif |
{ "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, |
{ "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, |
{ "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, |
@@ -370,6 +374,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); |
@@ -633,6 +641,10 @@ void BrowserOptionsHandler::InitializePage() { |
#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
SetupBackgroundModeSettings(); |
#endif |
+#if defined(OS_WIN) |
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8) |
+ web_ui()->CallJavascriptFunction("BrowserOptions.showWin8DataPrivacy"); |
arv (Not doing code reviews)
2012/08/15 14:33:31
This doesn't seem right to me. We don't really nee
MAD
2012/08/15 19:29:41
Done.
|
+#endif |
} |
void BrowserOptionsHandler::CheckAutoLaunch( |