diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 19:30:42 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 19:30:42 +0000 |
| commit | 13637d5d74d5ac18b218ac8f0ba8506eef2417b6 (patch) | |
| tree | 717a2585bcbcc8ab2aaffe05855b1c2d5ac2775b /chrome/browser | |
| parent | f28cbb7246977eb443650f7d2fc9675b573317b2 (diff) | |
| download | chromium_src-13637d5d74d5ac18b218ac8f0ba8506eef2417b6.zip chromium_src-13637d5d74d5ac18b218ac8f0ba8506eef2417b6.tar.gz chromium_src-13637d5d74d5ac18b218ac8f0ba8506eef2417b6.tar.bz2 | |
Fix hang in clearing browsing data from incognito mode.
When deleting Keywords, the BrowsingDataRemover class may need to load the TemplateURLModel if it isn't loaded and delete keywords asynchronously from the Observe function. The check to see if we were getting the model with the right profile wasn't taking into account that we might be doing this while incognito, which led to us failing to set the waiting_for_keywords_ flag, resulting in a hang (issue 2145). This fixes that.
Review URL: http://codereview.chromium.org/9333
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browsing_data_remover.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index ef9e121..ac934ca 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -151,7 +151,7 @@ void BrowsingDataRemover::Observe(NotificationType type, // them to complete before continuing. DCHECK(type == TEMPLATE_URL_MODEL_LOADED); TemplateURLModel* model = Source<TemplateURLModel>(source).ptr(); - if (model->profile() == profile_) { + if (model->profile() == profile_->GetOriginalProfile()) { NotificationService::current()->RemoveObserver( this, TEMPLATE_URL_MODEL_LOADED, Source<TemplateURLModel>(model)); |