diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 01:47:16 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 01:47:16 +0000 |
commit | b3edb31e6ec0a3a3a312718933e907f341606548 (patch) | |
tree | b9e73b4dd19be2535b13c1ab2b270d84dafbd910 /chrome/browser/browsing_data_remover.h | |
parent | 825ff8d48aee34b10ef6198743755b88c01a0e6b (diff) | |
download | chromium_src-b3edb31e6ec0a3a3a312718933e907f341606548.zip chromium_src-b3edb31e6ec0a3a3a312718933e907f341606548.tar.gz chromium_src-b3edb31e6ec0a3a3a312718933e907f341606548.tar.bz2 |
More NotificationRegistrar conversions.
BUG=2381
Review URL: http://codereview.chromium.org/115674
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_remover.h')
-rw-r--r-- | chrome/browser/browsing_data_remover.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h index 62172a0..0425c6f 100644 --- a/chrome/browser/browsing_data_remover.h +++ b/chrome/browser/browsing_data_remover.h @@ -8,7 +8,7 @@ #include "base/observer_list.h" #include "base/time.h" #include "chrome/browser/cancelable_request.h" -#include "chrome/common/notification_observer.h" +#include "chrome/common/notification_registrar.h" class MessageLoop; class Profile; @@ -90,10 +90,12 @@ class BrowsingDataRemover : public NotificationObserver { // Returns true if we're all done. bool all_done() { - return !waiting_for_keywords_ && !waiting_for_clear_cache_ && + return registrar_.IsEmpty() && !waiting_for_clear_cache_ && !waiting_for_clear_history_; } + NotificationRegistrar registrar_; + // Profile we're to remove from. Profile* profile_; @@ -106,9 +108,6 @@ class BrowsingDataRemover : public NotificationObserver { // True if Remove has been invoked. static bool removing_; - // True if we're waiting for the TemplateURLModel to finish loading. - bool waiting_for_keywords_; - // True if we're waiting for the history to be deleted. bool waiting_for_clear_history_; |