Hide Flash storage settings link.

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

Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 010c92cc7e6e1a939ec9e83259092f326df72217..32f24f33abc5ff96491be8cefd3923c191de93a6 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -29,8 +29,7 @@ ClearBrowserDataHandler::~ClearBrowserDataHandler() {
 void ClearBrowserDataHandler::Initialize() {
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
                                       g_browser_process->local_state(),
-                                      this);
-  UpdateClearPluginLSOData();
+                                      NULL);
 }
 
 void ClearBrowserDataHandler::GetLocalizedValues(
@@ -49,6 +48,8 @@ void ClearBrowserDataHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_DEL_CACHE_CHKBOX));
   localized_strings->SetString("deleteCookiesCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_COOKIES_CHKBOX));
+  localized_strings->SetString("deleteCookiesFlashCheckbox",
+      l10n_util::GetStringUTF16(IDS_DEL_COOKIES_FLASH_CHKBOX));
   localized_strings->SetString("deletePasswordsCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_PASSWORDS_CHKBOX));
   localized_strings->SetString("deleteFormDataCheckbox",
@@ -97,24 +98,6 @@ void ClearBrowserDataHandler::RegisterMessages() {
       NewCallback(this, &ClearBrowserDataHandler::HandleClearBrowserData));
 }
 
-void ClearBrowserDataHandler::Observe(NotificationType type,
-                                      const NotificationSource& source,
-                                      const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::PREF_CHANGED: {
-      const std::string& pref_name = *Details<std::string>(details).ptr();
-      if (pref_name == prefs::kClearPluginLSODataEnabled)
-        UpdateClearPluginLSOData();
-      else
-        OptionsPageUIHandler::Observe(type, source, details);
-      break;
-    }
-
-    default:
-      OptionsPageUIHandler::Observe(type, source, details);
-  }
-}
-
 void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
   Profile* profile = web_ui_->GetProfile();
   PrefService* prefs = profile->GetPrefs();
@@ -128,7 +111,7 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
   if (prefs->GetBoolean(prefs::kDeleteCookies)) {
     remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
-    if (clear_plugin_lso_data_enabled_.GetValue())
+    if (*clear_plugin_lso_data_enabled_)
       remove_mask |= BrowsingDataRemover::REMOVE_LSO_DATA;
   }
   if (prefs->GetBoolean(prefs::kDeletePasswords))
@@ -150,16 +133,6 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
   remover_->Remove(remove_mask);
 }
 
-void ClearBrowserDataHandler::UpdateClearPluginLSOData() {
-  int label_id = clear_plugin_lso_data_enabled_.GetValue() ?
-      IDS_DEL_COOKIES_FLASH_CHKBOX :
-      IDS_DEL_COOKIES_CHKBOX;
-  scoped_ptr<Value> label(
-      Value::CreateStringValue(l10n_util::GetStringUTF16(label_id)));
-  web_ui_->CallJavascriptFunction(
-      "ClearBrowserDataOverlay.setClearLocalDataLabel", *label);
-}
-
 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.