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/dom_ui/history_ui.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/dom_ui/history_ui.h')
-rw-r--r-- | chrome/browser/dom_ui/history_ui.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/history_ui.h b/chrome/browser/dom_ui/history_ui.h index d6bed47..cc643b1 100644 --- a/chrome/browser/dom_ui/history_ui.h +++ b/chrome/browser/dom_ui/history_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_DOM_UI_HISTORY_UI_H__ #define CHROME_BROWSER_DOM_UI_HISTORY_UI_H__ +#include "base/scoped_ptr.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/dom_ui.h" @@ -70,7 +71,7 @@ class BrowsingHistoryHandler : public DOMMessageHandler, std::wstring search_text_; // Browsing history remover - BrowsingDataRemover* remover_; + scoped_ptr<BrowsingDataRemover> remover_; // Our consumer for the history service. CancelableRequestConsumerTSimple<PageUsageData*> cancelable_consumer_; |