| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/download/download_manager_impl.h" | 5 #include "content/browser/download/download_manager_impl.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 make_scoped_refptr(this), | 421 make_scoped_refptr(this), |
| 422 GenerateFileHash(), bound_net_log, | 422 GenerateFileHash(), bound_net_log, |
| 423 callback)); | 423 callback)); |
| 424 | 424 |
| 425 return download_id; | 425 return download_id; |
| 426 } | 426 } |
| 427 | 427 |
| 428 void DownloadManagerImpl::OnDownloadFileCreated( | 428 void DownloadManagerImpl::OnDownloadFileCreated( |
| 429 int32 download_id, content::DownloadInterruptReason reason) { | 429 int32 download_id, content::DownloadInterruptReason reason) { |
| 430 if (reason != content::DOWNLOAD_INTERRUPT_REASON_NONE) { | 430 if (reason != content::DOWNLOAD_INTERRUPT_REASON_NONE) { |
| 431 OnDownloadInterrupted(download_id, 0, "", reason); | 431 OnDownloadInterrupted(download_id, reason); |
| 432 // TODO(rdsmith): It makes no sense to continue along the | 432 // TODO(rdsmith): It makes no sense to continue along the |
| 433 // regular download path after we've gotten an error. But it's | 433 // regular download path after we've gotten an error. But it's |
| 434 // the way the code has historically worked, and this allows us | 434 // the way the code has historically worked, and this allows us |
| 435 // to get the download persisted and observers of the download manager | 435 // to get the download persisted and observers of the download manager |
| 436 // notified, so tests work. When we execute all side effects of cancel | 436 // notified, so tests work. When we execute all side effects of cancel |
| 437 // (including queue removal) immedately rather than waiting for | 437 // (including queue removal) immedately rather than waiting for |
| 438 // persistence we should replace this comment with a "return;". | 438 // persistence we should replace this comment with a "return;". |
| 439 } | 439 } |
| 440 | 440 |
| 441 if (!delegate_ || delegate_->ShouldStartDownload(download_id)) | 441 if (!delegate_ || delegate_->ShouldStartDownload(download_id)) |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 // This function is called from the DownloadItem, so DI state | 764 // This function is called from the DownloadItem, so DI state |
| 765 // should already have been updated. | 765 // should already have been updated. |
| 766 AssertStateConsistent(download); | 766 AssertStateConsistent(download); |
| 767 | 767 |
| 768 DCHECK(file_manager_); | 768 DCHECK(file_manager_); |
| 769 download->OffThreadCancel(file_manager_); | 769 download->OffThreadCancel(file_manager_); |
| 770 } | 770 } |
| 771 | 771 |
| 772 void DownloadManagerImpl::OnDownloadInterrupted( | 772 void DownloadManagerImpl::OnDownloadInterrupted( |
| 773 int32 download_id, | 773 int32 download_id, |
| 774 int64 size, | |
| 775 const std::string& hash_state, | |
| 776 content::DownloadInterruptReason reason) { | 774 content::DownloadInterruptReason reason) { |
| 777 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 775 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 778 | 776 |
| 779 DownloadItem* download = GetActiveDownload(download_id); | 777 DownloadItem* download = GetActiveDownload(download_id); |
| 780 if (!download) | 778 if (!download) |
| 781 return; | 779 return; |
| 782 download->UpdateProgress(size, 0, hash_state); | |
| 783 download->Interrupt(reason); | 780 download->Interrupt(reason); |
| 784 } | 781 } |
| 785 | 782 |
| 786 DownloadItem* DownloadManagerImpl::GetActiveDownload(int32 download_id) { | 783 DownloadItem* DownloadManagerImpl::GetActiveDownload(int32 download_id) { |
| 787 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 784 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 788 DownloadMap::iterator it = active_downloads_.find(download_id); | 785 DownloadMap::iterator it = active_downloads_.find(download_id); |
| 789 if (it == active_downloads_.end()) | 786 if (it == active_downloads_.end()) |
| 790 return NULL; | 787 return NULL; |
| 791 | 788 |
| 792 DownloadItem* download = it->second; | 789 DownloadItem* download = it->second; |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1186 void DownloadManagerImpl::DownloadRenamedToFinalName( | 1183 void DownloadManagerImpl::DownloadRenamedToFinalName( |
| 1187 DownloadItem* download) { | 1184 DownloadItem* download) { |
| 1188 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1185 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 1189 // If the rename failed, we receive an OnDownloadInterrupted() call before we | 1186 // If the rename failed, we receive an OnDownloadInterrupted() call before we |
| 1190 // receive the DownloadRenamedToFinalName() call. | 1187 // receive the DownloadRenamedToFinalName() call. |
| 1191 if (delegate_) { | 1188 if (delegate_) { |
| 1192 delegate_->UpdatePathForItemInPersistentStore( | 1189 delegate_->UpdatePathForItemInPersistentStore( |
| 1193 download, download->GetFullPath()); | 1190 download, download->GetFullPath()); |
| 1194 } | 1191 } |
| 1195 } | 1192 } |
| OLD | NEW |