Simplify the support string in the Clear Browsing Data dialog.

chrome/browser/ui/webui/options/clear_browser_data_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/options/clear_browser_data_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_counter.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/passwords_counter.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/accelerator_utils.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/google/core/browser/google_util.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace {
 
 const char kClearBrowsingDataLearnMoreUrl[] =
     "https://support.google.com/chrome/?p=settings_clear_browsing_data";
 
 bool AreCountersEnabled() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableClearBrowsingDataCounters);
 }
 
+bool IsSupportStringSimplified() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kSimpleClearBrowsingDataSupportString);
+}
+
 }  // namespace
 
 namespace options {
 
 ClearBrowserDataHandler::ClearBrowserDataHandler()
-    : remover_(NULL) {
+    : remover_(NULL),
+      sync_service_(NULL) {

[Bernhard Bauer, 2015/09/26 06:46:07]

Prefer nullptr over NULL (the line above as well if you're already touching code
here).

[msramek, 2015/09/28 08:41:42]

Done.

 }
 
 ClearBrowserDataHandler::~ClearBrowserDataHandler() {
   if (remover_)
     remover_->RemoveObserver(this);
+  if (sync_service_)
+    sync_service_->RemoveObserver(this);
 }
 
 void ClearBrowserDataHandler::InitializeHandler() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled, prefs);
   pepper_flash_settings_enabled_.Init(prefs::kPepperFlashSettingsEnabled,
                                       prefs);
   allow_deleting_browser_history_.Init(
       prefs::kAllowDeletingBrowserHistory,
       prefs,
       base::Bind(&ClearBrowserDataHandler::OnBrowsingHistoryPrefChanged,
                  base::Unretained(this)));
 
   if (AreCountersEnabled()) {
     AddCounter(
         make_scoped_ptr(new PasswordsCounter()), IDS_DEL_PASSWORDS_COUNTER);
     // TODO(msramek): Add counters for browsing history and cache.
   }
+
+  if (IsSupportStringSimplified()) {
+    sync_service_ =
+        ProfileSyncServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
+    if (sync_service_)
+      sync_service_->AddObserver(this);
+  }
 }
 
 void ClearBrowserDataHandler::InitializePage() {
+  web_ui()->CallJavascriptFunction(
+      "ClearBrowserDataOverlay.createFooter",
+      base::FundamentalValue(IsSupportStringSimplified()),
+      base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()));
   UpdateInfoBannerVisibility();
   OnBrowsingHistoryPrefChanged();
   bool removal_in_progress = !!remover_;
   web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.setClearing",
                                    base::FundamentalValue(removal_in_progress));
 
   for (BrowsingDataCounter* counter : counters_) {
     DCHECK(AreCountersEnabled());
     counter->Restart();
   }
@@ skipping 23 matching lines @@
   web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.setBannerText",
                                    base::StringValue(text));
 }
 
 void ClearBrowserDataHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "clearBrowserDataLabel", IDS_CLEAR_BROWSING_DATA_LABEL },
-    { "contentSettingsAndSearchEnginesRemain",
-      IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS },
+    { "clearBrowserDataSyncWarning", IDS_CLEAR_BROWSING_DATA_SYNCED_DELETION },
+    { "clearBrowserDataSupportString", IsSupportStringSimplified()
+        ? IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS_SIMPLE
+        : IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS },
     { "deleteBrowsingHistoryCheckbox", IDS_DEL_BROWSING_HISTORY_CHKBOX },
     { "deleteDownloadHistoryCheckbox", IDS_DEL_DOWNLOAD_HISTORY_CHKBOX },
     { "deleteCacheCheckbox", IDS_DEL_CACHE_CHKBOX },
     { "deleteCookiesCheckbox", IDS_DEL_COOKIES_CHKBOX },
     { "deleteCookiesFlashCheckbox", IDS_DEL_COOKIES_FLASH_CHKBOX },
     { "deletePasswordsCheckbox", IDS_DEL_PASSWORDS_CHKBOX },
     { "deleteFormDataCheckbox", IDS_DEL_FORM_DATA_CHKBOX },
     { "deleteHostedAppsDataCheckbox", IDS_DEL_HOSTED_APPS_DATA_CHKBOX },
     { "deauthorizeContentLicensesCheckbox",
       IDS_DEAUTHORIZE_CONTENT_LICENSES_CHKBOX },
@@ skipping 170 matching lines @@
   base::string16 text = finished
       ? l10n_util::GetPluralStringFUTF16(text_grd_id, count)
       : l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_CALCULATING);
 
   web_ui()->CallJavascriptFunction(
       "ClearBrowserDataOverlay.updateCounter",
       base::StringValue(pref_name),
       base::StringValue(text));
 }
 
+void ClearBrowserDataHandler::OnStateChanged() {
+  web_ui()->CallJavascriptFunction(
+      "ClearBrowserDataOverlay.updateSyncWarning",
+      base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()));
+}
+
 }  // namespace options