| Index: chrome/browser/ui/views/clear_browsing_data.h
|
| diff --git a/chrome/browser/ui/views/clear_browsing_data.h b/chrome/browser/ui/views/clear_browsing_data.h
|
| index 8b1359eb8538bbdfabf4951acb52cfca02805ec1..fb615f1ddd1174b973fefdcd73c50b563cd3015f 100644
|
| --- a/chrome/browser/ui/views/clear_browsing_data.h
|
| +++ b/chrome/browser/ui/views/clear_browsing_data.h
|
| @@ -8,6 +8,8 @@
|
|
|
| #include "app/combobox_model.h"
|
| #include "chrome/browser/browsing_data_remover.h"
|
| +#include "chrome/browser/plugin_data_remover_helper.h"
|
| +#include "chrome/common/notification_observer.h"
|
| #include "views/controls/button/button.h"
|
| #include "views/controls/combobox/combobox.h"
|
| #include "views/controls/label.h"
|
| @@ -38,7 +40,8 @@ class ClearBrowsingDataView : public views::View,
|
| public ComboboxModel,
|
| public views::Combobox::Listener,
|
| public BrowsingDataRemover::Observer,
|
| - public views::LinkController {
|
| + public views::LinkController,
|
| + public NotificationObserver {
|
| public:
|
| explicit ClearBrowsingDataView(Profile* profile);
|
| virtual ~ClearBrowsingDataView(void);
|
| @@ -80,16 +83,25 @@ class ClearBrowsingDataView : public views::View,
|
| // Overridden from views::ButtonListener:
|
| virtual void ButtonPressed(views::Button* sender, const views::Event& event);
|
|
|
| - // Overriden from views::LinkController:
|
| + // Overridden from views::LinkController:
|
| virtual void LinkActivated(views::Link* source, int event_flags);
|
|
|
| + // Overridden from NotificationObserver:
|
| + virtual void Observe(NotificationType type,
|
| + const NotificationSource& source,
|
| + const NotificationDetails& details);
|
| +
|
| private:
|
| // Adds a new check-box as a child to the view.
|
| views::Checkbox* AddCheckbox(const std::wstring& text, bool checked);
|
|
|
| + // Updates the state of the "Delete plug-in data" checkbox based on whether
|
| + // deleting plug-in LSO data is supported.
|
| + void UpdateDelLSODataState();
|
| +
|
| // Sets the controls on the UI to be enabled/disabled depending on whether we
|
| - // have a delete operation in progress or not.
|
| - void UpdateControlEnabledState();
|
| + // have a delete operation in progress.
|
| + void UpdateControlState();
|
|
|
| // Starts the process of deleting the browsing data depending on what the
|
| // user selected.
|
| @@ -109,6 +121,7 @@ class ClearBrowsingDataView : public views::View,
|
| views::Checkbox* del_cache_checkbox_;
|
| views::Checkbox* del_cookies_checkbox_;
|
| views::Checkbox* del_passwords_checkbox_;
|
| + views::Checkbox* del_lso_data_checkbox_;
|
| views::Checkbox* del_form_data_checkbox_;
|
| views::Label* time_period_label_;
|
| views::Combobox* time_period_combobox_;
|
| @@ -118,6 +131,8 @@ class ClearBrowsingDataView : public views::View,
|
|
|
| Profile* profile_;
|
|
|
| + PluginDataRemoverHelper del_lso_data_enabled_;
|
| +
|
| // If non-null it means removal is in progress. BrowsingDataRemover takes care
|
| // of deleting itself when done.
|
| BrowsingDataRemover* remover_;
|
|
|