diff options
| author | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 17:27:49 +0000 |
|---|---|---|
| committer | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 17:27:49 +0000 |
| commit | 7bb88fb2386f0805fbecaa4b14e7809f3718b0bc (patch) | |
| tree | 85272e27efef74be9d7e248d18561e04428669e7 /chrome/browser/ui/webui/chromeos | |
| parent | 1b580217903418e0f0ca118331ec5c6270335155 (diff) | |
| download | chromium_src-7bb88fb2386f0805fbecaa4b14e7809f3718b0bc.zip chromium_src-7bb88fb2386f0805fbecaa4b14e7809f3718b0bc.tar.gz chromium_src-7bb88fb2386f0805fbecaa4b14e7809f3718b0bc.tar.bz2 | |
Make cancel remove cancelled download from active queues at time of cancel.
Also add various tests required or enabled by this change.
This changes two aspects of Cancel semantics (for downloads, not save page):
a) Cancel can now be called anytime during the lifetime of a download, and
b) if it is called before the history callback occurs, the download will be removed from the system (no where to store it persistently while waiting)
BUG=85408
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=101510
Review URL: http://codereview.chromium.org/7796014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/chromeos')
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index 9e54398..1130256 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -509,7 +509,7 @@ void WebUIHandler::ProcessError(int message_id) { // We don't want to process Download Cancelled signal. active_download_item_->RemoveObserver(this); if (active_download_item_->IsPartialDownload()) - active_download_item_->Cancel(true); + active_download_item_->Cancel(); active_download_item_->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD); active_download_item_ = NULL; CleanupDownloadObjects(); |