Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3224)

Unified Diff: content/browser/download/download_manager_impl.cc

Issue 8404049: Added member data to classes to support download resumption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rearranged structures for greater consistency. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f1a730925229a790d46fe26b074be90ae79889b1..d569bd0478f37c413643b7b1d96c2f46cd0085e2 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc
@@ -284,8 +284,7 @@ void DownloadManagerImpl::OnFileRemovalDetected(int64 db_handle) {
}
}
-void DownloadManagerImpl::RestartDownload(
- int32 download_id) {
+void DownloadManagerImpl::RestartDownload(int32 download_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DownloadItem* download = GetActiveDownloadItem(download_id);
@@ -378,13 +377,15 @@ void DownloadManagerImpl::ContinueDownloadWithPath(
delegate_->AddItemToPersistentStore(download);
}
-void DownloadManagerImpl::UpdateDownload(int32 download_id, int64 size) {
+void DownloadManagerImpl::UpdateDownload(int32 download_id,
+ int64 size,
+ std::string hash_state) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DownloadMap::iterator it = active_downloads_.find(download_id);
if (it != active_downloads_.end()) {
DownloadItem* download = it->second;
if (download->IsInProgress()) {
- download->Update(size);
+ download->Update(size, hash_state);
UpdateDownloadProgress(); // Reflect size updates.
delegate_->UpdateItemInPersistentStore(download);
}
@@ -575,6 +576,7 @@ void DownloadManagerImpl::DownloadCancelledInternal(DownloadItem* download) {
void DownloadManagerImpl::OnDownloadInterrupted(int32 download_id,
int64 size,
+ std::string hash_state,
InterruptReason reason) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -589,7 +591,7 @@ void DownloadManagerImpl::OnDownloadInterrupted(int32 download_id,
<< " download = " << download->DebugString(true);
RemoveFromActiveList(download);
- download->Interrupted(size, reason);
+ download->Interrupted(size, hash_state, reason);
download->OffThreadCancel(file_manager_);
}
@@ -723,6 +725,7 @@ void DownloadManagerImpl::DownloadUrlToFile(const GURL& url,
DCHECK(tab_contents);
ResourceDispatcherHost* resource_dispatcher_host =
content::GetContentClient()->browser()->GetResourceDispatcherHost();
+
// We send a pointer to content::ResourceContext, instead of the usual
// reference, so that a copy of the object isn't made.
// base::Bind can't handle 7 args, so we use URLParams and RenderParams.

Powered by Google App Engine
This is Rietveld 408576698