Show an extra privacy warning on Win8

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options2/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 74 matching lines @@
 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/options2/chromeos/timezone_options_util.h"
 #include "ui/gfx/image/image_skia.h"
 #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)
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #endif  // defined(TOOLKIT_GTK)
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadManager;
@@ skipping 113 matching lines @@
     { "networkPredictionEnabledDescription",
       IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
     { "passwordsAndAutofillGroupName",
       IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
     { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
     { "passwordGenerationEnabledDescription",
       IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL },
     { "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 },
     { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
     { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
     { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL },
     { "safeBrowsingEnableProtection",
       IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
     { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
     { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
@@ skipping 125 matching lines @@
 #if defined(OS_CHROMEOS)
     values->SetString("username",
         chromeos::UserManager::Get()->IsUserLoggedIn() ?
             chromeos::UserManager::Get()->GetLoggedInUser().email() :
             std::string());
 #endif
 
   // 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);
 
   values->SetString(
       "languageSectionLabel",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
 
@@ skipping 243 matching lines @@
   } else {
     RemoveCloudPrintConnectorSection();
   }
 #endif
 #if defined(OS_CHROMEOS)
   SetupAccessibilityFeatures();
 #endif
 #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 need an "RPC" to do this. We can
easily check if we are using win8 on the "client".

[MAD, 2012/08/15 19:29:41]

Done.

+#endif
 }
 
 void BrowserOptionsHandler::CheckAutoLaunch(
     base::WeakPtr<BrowserOptionsHandler> weak_this,
     const FilePath& profile_path) {
 #if defined(OS_WIN)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Auto-launch is not supported for secondary profiles yet.
   if (profile_path.BaseName().value() != ASCIIToUTF16(chrome::kInitialProfile))
@@ skipping 787 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupSSLConfigSettings() {
   base::FundamentalValue checked(rev_checking_enabled_.GetValue());
   base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
 }
 
 }  // namespace options2