Add UI to the Clear Browsing Data dialog to remove Flash LSO data.

chrome/browser/dom_ui/options/clear_browser_data_handler.cc

 // Copyright (c) 2010 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/dom_ui/options/clear_browser_data_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/values.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/notification_details.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 ClearBrowserDataHandler::ClearBrowserDataHandler() : remover_(NULL) {
 }
 
 ClearBrowserDataHandler::~ClearBrowserDataHandler() {
   if (remover_) {
     remover_->RemoveObserver(this);
   }
 }
 
+void ClearBrowserDataHandler::Initialize() {
+  clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
+                                      g_browser_process->local_state(),
+                                      this);
+  UpdateClearPluginLSOData();
+}
+
 void ClearBrowserDataHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   localized_strings->SetString("clearBrowsingDataTitle",
       l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_TITLE));
   localized_strings->SetString("clearBrowsingDataLabel",
       l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_LABEL));
   localized_strings->SetString("clearBrowsingDataTimeLabel",
       l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_TIME_LABEL));
   localized_strings->SetString("deleteBrowsingHistoryCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_BROWSING_HISTORY_CHKBOX));
   localized_strings->SetString("deleteDownloadHistoryCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_DOWNLOAD_HISTORY_CHKBOX));
   localized_strings->SetString("deleteCacheCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_CACHE_CHKBOX));
   localized_strings->SetString("deleteCookiesCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_COOKIES_CHKBOX));
   localized_strings->SetString("deletePasswordsCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_PASSWORDS_CHKBOX));
+  localized_strings->SetString("deleteLSODataCheckbox",
+      l10n_util::GetStringUTF16(IDS_DEL_FLASH_DATA_CHKBOX));
   localized_strings->SetString("deleteFormDataCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_FORM_DATA_CHKBOX));
   localized_strings->SetString("clearBrowsingDataCommit",
       l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_COMMIT));
   localized_strings->SetString("flashStorageSettings",
       l10n_util::GetStringUTF16(IDS_FLASH_STORAGE_SETTINGS));
   localized_strings->SetString("flash_storage_url",
       l10n_util::GetStringUTF16(IDS_FLASH_STORAGE_URL));
   localized_strings->SetString("clearDataDeleting",
       l10n_util::GetStringUTF16(IDS_CLEAR_DATA_DELETING));
@@ skipping 26 matching lines @@
   localized_strings->Set("clearBrowsingDataTimeList", time_list);
 }
 
 void ClearBrowserDataHandler::RegisterMessages() {
   // Setup handlers specific to this panel.
   DCHECK(dom_ui_);
   dom_ui_->RegisterMessageCallback("performClearBrowserData",
       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();
+      break;

[Evan Stade, 2010/12/22 00:16:40]

should unhandled PREF_CHANGED notifications be passed up to
OptionsPageUIHandler?

[Bernhard Bauer, 2010/12/22 03:40:05]

Hm. I don't want to confuse OptionsPageUIHandler with preferences it didn't
register, on the other hand receiving a notification we didn't register for
would indeed warrant a DCHECK(). But the current implementation is empty anyway,
so I'd say we do it, just to be consistent with below.

+    }
+
+    default:
+      OptionsPageUIHandler::Observe(type, source, details);
+  }
+}
+
 void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
   Profile *profile = dom_ui_->GetProfile();
   PrefService *prefs = profile->GetPrefs();
 
   int remove_mask = 0;
   if (prefs->GetBoolean(prefs::kDeleteBrowsingHistory))
     remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
   if (prefs->GetBoolean(prefs::kDeleteDownloadHistory))
     remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   if (prefs->GetBoolean(prefs::kDeleteCache))
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
   if (prefs->GetBoolean(prefs::kDeleteCookies))
     remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
   if (prefs->GetBoolean(prefs::kDeletePasswords))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
+  if (prefs->GetBoolean(prefs::kDeleteLSOData))
+    remove_mask |= BrowsingDataRemover::REMOVE_LSO_DATA;
   if (prefs->GetBoolean(prefs::kDeleteFormData))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
 
   int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
 
   FundamentalValue state(true);
   dom_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.setClearingState",
                                   state);
 
   // BrowsingDataRemover deletes itself when done.
   remover_ = new BrowsingDataRemover(profile,
       static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
       base::Time());
   remover_->AddObserver(this);
   remover_->Remove(remove_mask);
 }
 
+void ClearBrowserDataHandler::UpdateClearPluginLSOData() {
+  scoped_ptr<Value> enabled(
+      Value::CreateBooleanValue(clear_plugin_lso_data_enabled_.GetValue()));
+  dom_ui_->CallJavascriptFunction(
+      L"ClearBrowserDataOverlay.setClearPluginLSODataEnabled",

[Evan Stade, 2010/12/22 00:16:40]

nit: no newline

[Bernhard Bauer, 2010/12/22 03:40:05]

I think the rule is if you start breaking lines, you put each parameter on a
separate line.

[Evan Stade, 2010/12/22 21:36:16]

actually I think either way is acceptable, but this way seems less readable to
me (the same isn't true when there are many arguments. In that case, one arg per
line is easier to read)

but I don't feel strongly

[Peter Kasting, 2010/12/22 22:39:22]

That's true of function declarations and definitions, but at callsites you're
allowed to do whatever is most readable.

[Bernhard Bauer, 2011/01/03 11:56:30]

OK, Done.

+      *enabled);
+}
+
 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   DCHECK(dom_ui_);
   dom_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.dismiss");
 }