diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 01:47:22 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 01:47:22 +0000 |
| commit | 13dc779186dedb868df4373ba694c9f5d7cdf419 (patch) | |
| tree | bf33dcecff152df552c29ab696677165baf04a94 /chrome/browser/browsing_data_remover.h | |
| parent | 08ca70052ad87e2fe620313585074b7ae453e64b (diff) | |
| download | chromium_src-13dc779186dedb868df4373ba694c9f5d7cdf419.zip chromium_src-13dc779186dedb868df4373ba694c9f5d7cdf419.tar.gz chromium_src-13dc779186dedb868df4373ba694c9f5d7cdf419.tar.bz2 | |
Resolve crash when deleting history by preventing the deleter from being called multiple times. We need to add UI to make what's happening clearer to the user, but this gets us over the hump for now. Also change the history page to queue deletions.Allow history search from the new tab page.Make history title inclusion safer (createTextNode changes).Show starred status on history page.BUG=8214,8163,8271,8284
Review URL: http://codereview.chromium.org/28308
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_remover.h')
| -rw-r--r-- | chrome/browser/browsing_data_remover.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h index 4affab2..96c8305 100644 --- a/chrome/browser/browsing_data_remover.h +++ b/chrome/browser/browsing_data_remover.h @@ -50,6 +50,8 @@ class BrowsingDataRemover : public NotificationObserver { // Called when history deletion is done. void OnHistoryDeletionDone(); + static bool is_removing() { return removing_; } + private: // NotificationObserver method. Callback when TemplateURLModel has finished // loading. Deletes the entries from the model, and if we're not waiting on @@ -86,7 +88,7 @@ class BrowsingDataRemover : public NotificationObserver { const base::Time delete_end_; // True if Remove has been invoked. - bool removing_; + static bool removing_; // True if we're waiting for the TemplateURLModel to finish loading. bool waiting_for_keywords_; |