Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4367)

Unified Diff: chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h

Issue 2133893002: [MD settings] disable clear browsing data while it is running (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
index d8a09e5810c4b9962beb947554aafcebc168fb71..02bc284cf7bfbc1052c6ab5bfbae4795c6f2423a 100644
--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_CLEAR_BROWSING_DATA_HANDLER_H_
#include <memory>
+#include <string>
#include <vector>
#include "base/macros.h"
@@ -45,8 +46,7 @@ class ClearBrowsingDataHandler : public SettingsPageUIHandler,
void HandleClearBrowsingData(const base::ListValue* value);
// BrowsingDataRemover::Observer implementation.
- // Re-enables clear button once all requested data has been removed.
- void OnBrowsingDataRemoverDone() override;
+ void OnBrowsingDataRemoving(bool is_removing) override;
// Updates UI when the pref to allow clearing history changes.
virtual void OnBrowsingHistoryPrefChanged();
@@ -89,8 +89,10 @@ class ClearBrowsingDataHandler : public SettingsPageUIHandler,
ScopedObserver<ProfileSyncService, sync_driver::SyncServiceObserver>
sync_service_observer_;
- // If non-null it means removal is in progress.
+ // Observe the remover progress.
BrowsingDataRemover* remover_;
+ ScopedObserver<BrowsingDataRemover, BrowsingDataRemover::Observer>
+ remover_observer_;
// The WebUI callback ID of the last performClearBrowserData request. There
// can only be one such request in-flight.

Powered by Google App Engine
This is Rietveld 408576698