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

Unified Diff: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Issue 7050031: dom-ui settings: Stop observing an existing BrowserDataRemover before creating a new one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Style tweaks (cosmetic) Created 9 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/clear_browser_data_handler.cc (revision 84869)
+++ chrome/browser/ui/webui/options/clear_browser_data_handler.cc (working copy)
@@ -21,9 +21,8 @@
}
ClearBrowserDataHandler::~ClearBrowserDataHandler() {
- if (remover_) {
+ if (remover_)
remover_->RemoveObserver(this);
- }
}
void ClearBrowserDataHandler::Initialize() {
@@ -125,6 +124,11 @@
web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.setClearingState",
state);
+ // If we are still observing a previous data remover, we need to stop
+ // observing.
+ if (remover_)
+ remover_->RemoveObserver(this);
+
// BrowsingDataRemover deletes itself when done.
remover_ = new BrowsingDataRemover(profile,
static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698