Index: content/browser/download/download_manager_impl.cc |
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc |
index 08b163d32be5e9d454e59d1227a04c4afda6faca..60a1901fd4e16c66d54f0b9b23b43282066c365b 100644 |
--- a/content/browser/download/download_manager_impl.cc |
+++ b/content/browser/download/download_manager_impl.cc |
@@ -344,19 +344,8 @@ void DownloadManagerImpl::Shutdown() { |
// associative containers such as sets. |
it++; |
Randy Smith (Not in Mondays)
2013/05/28 17:29:40
We're no longer removing downloads here, so would
asanka
2013/05/28 22:01:39
Done.
|
- if (download->IsDangerous() && download->IsPartialDownload()) { |
- // The user hasn't accepted it, so we need to remove it |
- // from the disk. This may or may not result in it being |
- // removed from the DownloadManager queues and deleted |
- // (specifically, DownloadManager::DownloadRemoved only |
- // removes and deletes it if it's known to the history service) |
- // so the only thing we know after calling this function is that |
- // the download was deleted if-and-only-if it was removed |
- // from all queues. |
- download->Delete(DownloadItem::DELETE_DUE_TO_BROWSER_SHUTDOWN); |
Randy Smith (Not in Mondays)
2013/05/28 17:29:40
There's a semantic difference we're putting in whi
asanka
2013/05/28 22:01:39
Yeah. I updated the CL description to mention this
|
- } else if (download->IsPartialDownload()) { |
+ if (download->GetState() == DownloadItem::IN_PROGRESS) |
download->Cancel(false); |
- } |
} |
// At this point, all dangerous downloads have had their files removed |