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

chrome/browser/ui/views/clear_browsing_data_view.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_view.h"
 
 #include "app/l10n_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 34 matching lines @@
       allow_clear_(true),
       throbber_view_(NULL),
       throbber_(NULL),
       status_label_(NULL),
       delete_all_label_(NULL),
       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),
       clear_browsing_data_button_(NULL),
       delete_in_progress_(false),
       profile_(profile),
       remover_(NULL) {
   DCHECK(profile);
   Init();
   InitControlLayout();
@@ skipping 39 matching lines @@
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteCache));
 
   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),
       profile_->GetPrefs()->GetBoolean(prefs::kDeletePasswords));
 
+  del_lso_data_checkbox_ =
+      AddCheckbox(l10n_util::GetString(IDS_DEL_FLASH_DATA_CHKBOX),
+      profile_->GetPrefs()->GetBoolean(prefs::kDeleteLSOData));
+
   del_form_data_checkbox_ =
       AddCheckbox(l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteFormData));
 
   clear_browsing_data_button_ = new views::NativeButton(
         this, l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_BUTTON));
 
   // 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));
@@ skipping 77 matching lines @@
 
   layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_cookies_checkbox_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_passwords_checkbox_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, indented_column_set_id);
+  layout->AddView(del_lso_data_checkbox_);
+  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+
+  layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_form_data_checkbox_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   // Time period label is next below the combo boxes followed by time
   // period combo box
   layout->StartRow(0, two_column_set_id);
   layout->AddView(time_period_label_);
   time_period_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->AddView(time_period_combobox_, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::CENTER);
@@ skipping 47 matching lines @@
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteBrowsingHistory,
         del_history_checkbox_->checked() ? true : false);
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteDownloadHistory,
         del_downloads_checkbox_->checked() ? true : false);
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteCache,
         del_cache_checkbox_->checked() ? true : false);
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteCookies,
         del_cookies_checkbox_->checked() ? true : false);
     profile_->GetPrefs()->SetBoolean(prefs::kDeletePasswords,
         del_passwords_checkbox_->checked() ? true : false);
+    profile_->GetPrefs()->SetBoolean(prefs::kDeleteLSOData,
+        del_lso_data_checkbox_->checked() ? true : false);
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData,
         del_form_data_checkbox_->checked() ? true : false);
     clear_data_parent_window_->StartClearingBrowsingData();
     OnDelete();
   }
 
   // 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.
   UpdateControlEnabledState();
 }
@@ skipping 16 matching lines @@
   checkbox->set_listener(this);
   return checkbox;
 }
 
 void ClearBrowsingDataView2::UpdateControlEnabledState() {
   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_lso_data_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_);
   if (delete_in_progress_)
     throbber_->Start();
   else
     throbber_->Stop();
 
   clear_browsing_data_button_->SetEnabled(
       allow_clear_ &&
       !delete_in_progress_ &&
           (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()));
 }
 
 // Convenience method that returns true if the supplied checkbox is selected
 // and enabled.
 static bool IsCheckBoxEnabledAndSelected(views::Checkbox* cb) {
   return (cb->IsEnabled() && cb->checked());
 }
 
 void ClearBrowsingDataView2::OnDelete() {
   int period_selected = time_period_combobox_->selected_item();
 
   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();
 
   // 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 ClearBrowsingDataView2::OnBrowsingDataRemoverDone() {
   clear_data_parent_window_->StopClearingBrowsingData();
 }