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

chrome/browser/ui/views/clear_browsing_data.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/views/clear_browsing_data.h"
 
 #include "app/l10n_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/browser.h"
-#if defined(OS_WIN)
-#include "chrome/browser/views/clear_browsing_data_view.h"
-#endif
+#include "chrome/common/notification_details.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/insets.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/url_request/url_request_context.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
 #include "views/controls/throbber.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/dialog_client_view.h"
 #include "views/window/window.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/views/clear_browsing_data_view.h"
+#endif
+
 using views::GridLayout;
 
 // The combo box is vertically aligned to the 'time-period' label, which makes
 // the combo box look a little too close to the check box above it when we use
 // standard layout to separate them. We therefore add a little extra margin to
 // the label, giving it a little breathing space.
 static const int kExtraMarginForTimePeriodLabel = 3;
 
 namespace browser {
 // Defined in browser_dialogs.h for creation of the view.
 void ShowClearBrowsingDataView(gfx::NativeWindow parent,
                                Profile* profile) {
 
   views::Window::CreateChromeWindow(parent, gfx::Rect(),
                                     new ClearBrowsingDataView(profile))->Show();
 }
 
 }  // namespace browser
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, public:
 
 ClearBrowsingDataView::ClearBrowsingDataView(Profile* profile)
     : del_history_checkbox_(NULL),
       del_downloads_checkbox_(NULL),
       del_cache_checkbox_(NULL),
       del_cookies_checkbox_(NULL),
       del_passwords_checkbox_(NULL),
+      del_lso_data_checkbox_(NULL),
       del_form_data_checkbox_(NULL),
       time_period_label_(NULL),
       time_period_combobox_(NULL),
       delete_in_progress_(false),
       profile_(profile),
       remover_(NULL) {
   DCHECK(profile);
   Init();
 }
 
 ClearBrowsingDataView::~ClearBrowsingDataView(void) {
   if (remover_) {
     // We were destroyed while clearing history was in progress. This can only
     // occur during automated tests (normally the user can't close the dialog
     // while clearing is in progress as the dialog is modal and not closeable).
     remover_->RemoveObserver(this);
   }
 }
 
 void ClearBrowsingDataView::Init() {
+  del_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
+                             g_browser_process->local_state(),
+                             this);
+
   // Views we will add to the *parent* of this dialog, since it will display
   // next to the buttons which we don't draw ourselves.
   throbber_ = new views::Throbber(50, true);
   throbber_->SetVisible(false);
 
   status_label_ = new views::Label(
       l10n_util::GetString(IDS_CLEAR_DATA_DELETING));
   status_label_->SetVisible(false);
 
   // Regular view controls we draw by ourself. First, we add the dialog label.
   delete_all_label_ = new views::Label(
       l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_LABEL));
   AddChildView(delete_all_label_);
 
   // Add all the check-boxes.
-  del_history_checkbox_ =
-      AddCheckbox(l10n_util::GetString(IDS_DEL_BROWSING_HISTORY_CHKBOX),
+  del_history_checkbox_ = AddCheckbox(
+      l10n_util::GetString(IDS_DEL_BROWSING_HISTORY_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteBrowsingHistory));
 
-  del_downloads_checkbox_ =
-      AddCheckbox(l10n_util::GetString(IDS_DEL_DOWNLOAD_HISTORY_CHKBOX),
+  del_downloads_checkbox_ = AddCheckbox(
+      l10n_util::GetString(IDS_DEL_DOWNLOAD_HISTORY_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteDownloadHistory));
 
-  del_cache_checkbox_ =
-      AddCheckbox(l10n_util::GetString(IDS_DEL_CACHE_CHKBOX),
+  del_cache_checkbox_ = AddCheckbox(
+      l10n_util::GetString(IDS_DEL_CACHE_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteCache));
 
-  del_cookies_checkbox_ =
-      AddCheckbox(l10n_util::GetString(IDS_DEL_COOKIES_CHKBOX),
+  del_cookies_checkbox_ = AddCheckbox(
+      l10n_util::GetString(IDS_DEL_COOKIES_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteCookies));
 
-  del_passwords_checkbox_ =
-      AddCheckbox(l10n_util::GetString(IDS_DEL_PASSWORDS_CHKBOX),
+  del_passwords_checkbox_ = AddCheckbox(
+      l10n_util::GetString(IDS_DEL_PASSWORDS_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeletePasswords));
 
-  del_form_data_checkbox_ =
-      AddCheckbox(l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX),
+  del_lso_data_checkbox_ = AddCheckbox(
+      l10n_util::GetString(IDS_DEL_FLASH_DATA_CHKBOX),
+      false);
+  UpdateDelLSODataState();
+
+  del_form_data_checkbox_ = AddCheckbox(
+      l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteFormData));
 
   // Add a label which appears before the combo box for the time period.
   time_period_label_ = new views::Label(
       l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_TIME_LABEL));
   AddChildView(time_period_label_);
 
   // Add the combo box showing how far back in time we want to delete.
   time_period_combobox_ = new views::Combobox(this);
   time_period_combobox_->SetSelectedItem(profile_->GetPrefs()->GetInteger(
@@ skipping 71 matching lines @@
                                        kRelatedControlVerticalSpacing,
                                    sz.width(), sz.height());
 
   sz = del_passwords_checkbox_->GetPreferredSize();
   del_passwords_checkbox_->SetBounds(2 * kPanelHorizMargin,
                                      del_cookies_checkbox_->y() +
                                          del_cookies_checkbox_->height() +
                                          kRelatedControlVerticalSpacing,
                                      sz.width(), sz.height());
 
+  sz = del_lso_data_checkbox_->GetPreferredSize();
+  del_lso_data_checkbox_->SetBounds(2 * kPanelHorizMargin,
+                                    del_passwords_checkbox_->y() +
+                                        del_passwords_checkbox_->height() +
+                                        kRelatedControlVerticalSpacing,
+                                    sz.width(), sz.height());
+
   sz = del_form_data_checkbox_->GetPreferredSize();
   del_form_data_checkbox_->SetBounds(2 * kPanelHorizMargin,
-                                     del_passwords_checkbox_->y() +
-                                         del_passwords_checkbox_->height() +
+                                     del_lso_data_checkbox_->y() +
+                                         del_lso_data_checkbox_->height() +
                                          kRelatedControlVerticalSpacing,
                                      sz.width(), sz.height());
 
   // Time period label is next below the combo boxes.
   sz = time_period_label_->GetPreferredSize();
   time_period_label_->SetBounds(kPanelHorizMargin,
                                 del_form_data_checkbox_->y() +
                                     del_form_data_checkbox_->height() +
                                     kRelatedControlVerticalSpacing +
                                     kExtraMarginForTimePeriodLabel,
@@ skipping 30 matching lines @@
     MessageBoxFlags::DialogButton button) const {
   if (delete_in_progress_)
     return false;
 
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
     return del_history_checkbox_->checked() ||
            del_downloads_checkbox_->checked() ||
            del_cache_checkbox_->checked() ||
            del_cookies_checkbox_->checked() ||
            del_passwords_checkbox_->checked() ||
+           del_lso_data_checkbox_->checked() ||
            del_form_data_checkbox_->checked();
   }
 
   return true;
 }
 
 bool ClearBrowsingDataView::CanResize() const {
   return false;
 }
 
@@ skipping 26 matching lines @@
   prefs->SetBoolean(prefs::kDeleteBrowsingHistory,
                     del_history_checkbox_->checked());
   prefs->SetBoolean(prefs::kDeleteDownloadHistory,
                     del_downloads_checkbox_->checked());
   prefs->SetBoolean(prefs::kDeleteCache,
                     del_cache_checkbox_->checked());
   prefs->SetBoolean(prefs::kDeleteCookies,
                     del_cookies_checkbox_->checked());
   prefs->SetBoolean(prefs::kDeletePasswords,
                     del_passwords_checkbox_->checked());
+  if (del_lso_data_enabled_.GetValue()) {
+    prefs->SetBoolean(prefs::kDeleteLSOData,
+                      del_lso_data_checkbox_->checked());
+  }
   prefs->SetBoolean(prefs::kDeleteFormData,
                     del_form_data_checkbox_->checked());
   OnDelete();
   return false;  // We close the dialog in OnBrowsingDataRemoverDone().
 }
 
 views::View* ClearBrowsingDataView::GetContentsView() {
   return this;
 }
 
@@ skipping 56 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, views::ButtonListener implementation:
 
 void ClearBrowsingDataView::ButtonPressed(views::Button* sender,
                                           const views::Event& event) {
   // When no checkbox is checked we should not have the action button enabled.
   // This forces the button to evaluate what state they should be in.
   GetDialogClientView()->UpdateDialogButtons();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// ClearBrowsingDataView, views::LinkController implementation:
+
 void ClearBrowsingDataView::LinkActivated(views::Link* source,
                                           int event_flags) {
   Browser* browser = Browser::Create(profile_);
   browser->OpenURL(GURL(l10n_util::GetStringUTF8(IDS_FLASH_STORAGE_URL)),
                    GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
   browser->window()->Show();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// ClearBrowsingDataView, NotificationObserver implementation:
+
+void ClearBrowsingDataView::Observe(NotificationType type,
+                                    const NotificationSource& source,
+                                    const NotificationDetails& details) {
+  if (type == NotificationType::PREF_CHANGED) {
+    const std::string& pref = *(Details<std::string>(details).ptr());
+    if (pref == prefs::kClearPluginLSODataEnabled) {
+      UpdateControlState();
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, private:
 
 views::Checkbox* ClearBrowsingDataView::AddCheckbox(const std::wstring& text,
                                                     bool checked) {
   views::Checkbox* checkbox = new views::Checkbox(text);
   checkbox->SetChecked(checked);
   checkbox->set_listener(this);
   AddChildView(checkbox);
   return checkbox;
 }
 
-void ClearBrowsingDataView::UpdateControlEnabledState() {
+void ClearBrowsingDataView::UpdateDelLSODataState() {
+  bool enabled = del_lso_data_enabled_.GetValue();
+  del_lso_data_checkbox_->SetChecked(
+      enabled &&
+      profile_->GetPrefs()->GetBoolean(prefs::kDeleteLSOData));
+  del_lso_data_checkbox_->SetTooltipText(
+      enabled ? std::wstring()
+              : l10n_util::GetString(IDS_LSO_CLEAR_MESSAGE).c_str());
+  del_lso_data_checkbox_->SetEnabled(enabled && !delete_in_progress_);
+}
+
+void ClearBrowsingDataView::UpdateControlState() {
   window()->EnableClose(!delete_in_progress_);
 
+  UpdateDelLSODataState();
   del_history_checkbox_->SetEnabled(!delete_in_progress_);
   del_downloads_checkbox_->SetEnabled(!delete_in_progress_);
   del_cache_checkbox_->SetEnabled(!delete_in_progress_);
   del_cookies_checkbox_->SetEnabled(!delete_in_progress_);
   del_passwords_checkbox_->SetEnabled(!delete_in_progress_);
   del_form_data_checkbox_->SetEnabled(!delete_in_progress_);
   time_period_combobox_->SetEnabled(!delete_in_progress_);
 
   status_label_->SetVisible(delete_in_progress_);
   throbber_->SetVisible(delete_in_progress_);
@@ skipping 17 matching lines @@
 
   int remove_mask = 0;
   if (IsCheckBoxEnabledAndSelected(del_history_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
   if (IsCheckBoxEnabledAndSelected(del_downloads_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   if (IsCheckBoxEnabledAndSelected(del_cookies_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
   if (IsCheckBoxEnabledAndSelected(del_passwords_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
+  if (IsCheckBoxEnabledAndSelected(del_lso_data_checkbox_))
+    remove_mask |= BrowsingDataRemover::REMOVE_LSO_DATA;
   if (IsCheckBoxEnabledAndSelected(del_form_data_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
   if (IsCheckBoxEnabledAndSelected(del_cache_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
 
   delete_in_progress_ = true;
-  UpdateControlEnabledState();
+  UpdateControlState();
 
   // 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 ClearBrowsingDataView::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   window()->Close();
 }