diff options
| author | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 21:55:06 +0000 |
|---|---|---|
| committer | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 21:55:06 +0000 |
| commit | c4f02c4b5e4c5bc9f38b65dfde707b0b83b3e147 (patch) | |
| tree | 67358cd532f0a19b8fb953bfddea23976bf25fb8 /chrome | |
| parent | 0c857214fd1094cb0edca4a7afb8b6f13c6deb52 (diff) | |
| download | chromium_src-c4f02c4b5e4c5bc9f38b65dfde707b0b83b3e147.zip chromium_src-c4f02c4b5e4c5bc9f38b65dfde707b0b83b3e147.tar.gz chromium_src-c4f02c4b5e4c5bc9f38b65dfde707b0b83b3e147.tar.bz2 | |
Check for cancel in DownloadManager::OnAllDataSaved().
BUG=70592
TEST=All downloads tests pass
Review URL: http://codereview.chromium.org/6327016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/download/download_manager.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 7e66e50..affdf94 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -509,7 +509,11 @@ void DownloadManager::OnAllDataSaved(int32 download_id, int64 size) { VLOG(20) << __FUNCTION__ << "()" << " download_id = " << download_id << " size = " << size; - DCHECK_EQ(1U, active_downloads_.count(download_id)); + // If it's not in active_downloads_, that means it was cancelled; just + // ignore the notification. + if (active_downloads_.count(download_id) == 0) + return; + DownloadItem* download = active_downloads_[download_id]; download->OnAllDataSaved(size); |