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

Unified Diff: chrome/browser/dom_ui/history_ui.cc

Issue 218001: BrowsingDataRemover* should not be scoped. (Closed)
Patch Set: Make BrowsingDataRemover destructor private Created 11 years, 3 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
« no previous file with comments | « chrome/browser/dom_ui/history_ui.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/history_ui.cc
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index 45a994b97a1c42c8fccb5f7d4de1e0b8c825abbf..978ad0749af84402e0e3546852aa17e20b29641d 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -104,7 +104,7 @@ BrowsingHistoryHandler::BrowsingHistoryHandler()
BrowsingHistoryHandler::~BrowsingHistoryHandler() {
cancelable_consumer_.CancelAllRequests();
- if (remover_.get())
+ if (remover_)
remover_->RemoveObserver(this);
}
@@ -204,9 +204,9 @@ void BrowsingHistoryHandler::HandleDeleteDay(const Value* value) {
base::Time begin_time = time.LocalMidnight();
base::Time end_time = begin_time + base::TimeDelta::FromDays(1);
- remover_.reset(new BrowsingDataRemover(dom_ui_->GetProfile(),
- begin_time,
- end_time));
+ remover_ = new BrowsingDataRemover(dom_ui_->GetProfile(),
+ begin_time,
+ end_time);
remover_->AddObserver(this);
remover_->Remove(BrowsingDataRemover::REMOVE_HISTORY |
BrowsingDataRemover::REMOVE_COOKIES |
@@ -215,8 +215,9 @@ void BrowsingHistoryHandler::HandleDeleteDay(const Value* value) {
void BrowsingHistoryHandler::OnBrowsingDataRemoverDone() {
dom_ui_->CallJavascriptFunction(L"deleteComplete");
- remover_->RemoveObserver(this);
- remover_.release();
+ // No need to remove ourselves as an observer as BrowsingDataRemover deletes
+ // itself after we return.
+ remover_ = NULL;
}
void BrowsingHistoryHandler::QueryComplete(
« no previous file with comments | « chrome/browser/dom_ui/history_ui.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698