diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
| commit | 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 (patch) | |
| tree | 5d4ae202b870bd86673f596f0d424bc4b3e55ebe /content/browser/download/download_item_impl.h | |
| parent | e862bac9c33104a29d98631d62668ae7b6676510 (diff) | |
| download | chromium_org-5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7.tar.gz | |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
Diffstat (limited to 'content/browser/download/download_item_impl.h')
| -rw-r--r-- | content/browser/download/download_item_impl.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h index 2086a54a89..f8f6cbc372 100644 --- a/content/browser/download/download_item_impl.h +++ b/content/browser/download/download_item_impl.h @@ -19,8 +19,8 @@ #include "content/browser/download/download_request_handle.h" #include "content/common/content_export.h" #include "content/public/browser/download_destination_observer.h" +#include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_item.h" -#include "net/base/net_errors.h" #include "net/base/net_log.h" #include "url/gurl.h" @@ -129,7 +129,7 @@ class CONTENT_EXPORT DownloadItemImpl virtual const std::string& GetHash() const OVERRIDE; virtual const std::string& GetHashState() const OVERRIDE; virtual bool GetFileExternallyRemoved() const OVERRIDE; - virtual void DeleteFile() OVERRIDE; + virtual void DeleteFile(const base::Callback<void(bool)>& callback) OVERRIDE; virtual bool IsDangerous() const OVERRIDE; virtual DownloadDangerType GetDangerType() const OVERRIDE; virtual bool TimeRemaining(base::TimeDelta* remaining) const OVERRIDE; @@ -163,6 +163,11 @@ class CONTENT_EXPORT DownloadItemImpl // INTERRUPTED state. virtual ResumeMode GetResumeMode() const; + // Notify the download item that new origin information is available due to a + // resumption request receiving a response. + virtual void MergeOriginInfoOnResume( + const DownloadCreateInfo& new_create_info); + // State transition operations on regular downloads -------------------------- // Start the download. @@ -335,7 +340,8 @@ class CONTENT_EXPORT DownloadItemImpl void Completed(); // Callback invoked when the URLRequest for a download resumption has started. - void OnResumeRequestStarted(DownloadItem* item, net::Error error); + void OnResumeRequestStarted(DownloadItem* item, + DownloadInterruptReason interrupt_reason); // Helper routines ----------------------------------------------------------- |