Index: content/browser/download/download_item_impl.h |
diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h |
index 5408f1156e8f4da35452a9e0c3eaa7934bb29f95..755bf60f910a3f941acfcd3c45ce191ee5cc72f3 100644 |
--- a/content/browser/download/download_item_impl.h |
+++ b/content/browser/download/download_item_impl.h |
@@ -90,74 +90,74 @@ class CONTENT_EXPORT DownloadItemImpl |
virtual ~DownloadItemImpl(); |
// DownloadItem |
- virtual void AddObserver(DownloadItem::Observer* observer) OVERRIDE; |
- virtual void RemoveObserver(DownloadItem::Observer* observer) OVERRIDE; |
- virtual void UpdateObservers() OVERRIDE; |
- virtual void ValidateDangerousDownload() OVERRIDE; |
+ virtual void AddObserver(DownloadItem::Observer* observer) override; |
+ virtual void RemoveObserver(DownloadItem::Observer* observer) override; |
+ virtual void UpdateObservers() override; |
+ virtual void ValidateDangerousDownload() override; |
virtual void StealDangerousDownload(const AcquireFileCallback& callback) |
- OVERRIDE; |
- virtual void Pause() OVERRIDE; |
- virtual void Resume() OVERRIDE; |
- virtual void Cancel(bool user_cancel) OVERRIDE; |
- virtual void Remove() OVERRIDE; |
- virtual void OpenDownload() OVERRIDE; |
- virtual void ShowDownloadInShell() OVERRIDE; |
- virtual uint32 GetId() const OVERRIDE; |
- virtual DownloadState GetState() const OVERRIDE; |
- virtual DownloadInterruptReason GetLastReason() const OVERRIDE; |
- virtual bool IsPaused() const OVERRIDE; |
- virtual bool IsTemporary() const OVERRIDE; |
- virtual bool CanResume() const OVERRIDE; |
- virtual bool IsDone() const OVERRIDE; |
- virtual const GURL& GetURL() const OVERRIDE; |
- virtual const std::vector<GURL>& GetUrlChain() const OVERRIDE; |
- virtual const GURL& GetOriginalUrl() const OVERRIDE; |
- virtual const GURL& GetReferrerUrl() const OVERRIDE; |
- virtual const GURL& GetTabUrl() const OVERRIDE; |
- virtual const GURL& GetTabReferrerUrl() const OVERRIDE; |
- virtual std::string GetSuggestedFilename() const OVERRIDE; |
- virtual std::string GetContentDisposition() const OVERRIDE; |
- virtual std::string GetMimeType() const OVERRIDE; |
- virtual std::string GetOriginalMimeType() const OVERRIDE; |
- virtual std::string GetRemoteAddress() const OVERRIDE; |
- virtual bool HasUserGesture() const OVERRIDE; |
- virtual ui::PageTransition GetTransitionType() const OVERRIDE; |
- virtual const std::string& GetLastModifiedTime() const OVERRIDE; |
- virtual const std::string& GetETag() const OVERRIDE; |
- virtual bool IsSavePackageDownload() const OVERRIDE; |
- virtual const base::FilePath& GetFullPath() const OVERRIDE; |
- virtual const base::FilePath& GetTargetFilePath() const OVERRIDE; |
- virtual const base::FilePath& GetForcedFilePath() const OVERRIDE; |
- virtual base::FilePath GetFileNameToReportUser() const OVERRIDE; |
- virtual TargetDisposition GetTargetDisposition() const OVERRIDE; |
- virtual const std::string& GetHash() const OVERRIDE; |
- virtual const std::string& GetHashState() const OVERRIDE; |
- virtual bool GetFileExternallyRemoved() const 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; |
- virtual int64 CurrentSpeed() const OVERRIDE; |
- virtual int PercentComplete() const OVERRIDE; |
- virtual bool AllDataSaved() const OVERRIDE; |
- virtual int64 GetTotalBytes() const OVERRIDE; |
- virtual int64 GetReceivedBytes() const OVERRIDE; |
- virtual base::Time GetStartTime() const OVERRIDE; |
- virtual base::Time GetEndTime() const OVERRIDE; |
- virtual bool CanShowInFolder() OVERRIDE; |
- virtual bool CanOpenDownload() OVERRIDE; |
- virtual bool ShouldOpenFileBasedOnExtension() OVERRIDE; |
- virtual bool GetOpenWhenComplete() const OVERRIDE; |
- virtual bool GetAutoOpened() OVERRIDE; |
- virtual bool GetOpened() const OVERRIDE; |
- virtual BrowserContext* GetBrowserContext() const OVERRIDE; |
- virtual WebContents* GetWebContents() const OVERRIDE; |
- virtual void OnContentCheckCompleted(DownloadDangerType danger_type) OVERRIDE; |
- virtual void SetOpenWhenComplete(bool open) OVERRIDE; |
- virtual void SetIsTemporary(bool temporary) OVERRIDE; |
- virtual void SetOpened(bool opened) OVERRIDE; |
- virtual void SetDisplayName(const base::FilePath& name) OVERRIDE; |
- virtual std::string DebugString(bool verbose) const OVERRIDE; |
+ override; |
+ virtual void Pause() override; |
+ virtual void Resume() override; |
+ virtual void Cancel(bool user_cancel) override; |
+ virtual void Remove() override; |
+ virtual void OpenDownload() override; |
+ virtual void ShowDownloadInShell() override; |
+ virtual uint32 GetId() const override; |
+ virtual DownloadState GetState() const override; |
+ virtual DownloadInterruptReason GetLastReason() const override; |
+ virtual bool IsPaused() const override; |
+ virtual bool IsTemporary() const override; |
+ virtual bool CanResume() const override; |
+ virtual bool IsDone() const override; |
+ virtual const GURL& GetURL() const override; |
+ virtual const std::vector<GURL>& GetUrlChain() const override; |
+ virtual const GURL& GetOriginalUrl() const override; |
+ virtual const GURL& GetReferrerUrl() const override; |
+ virtual const GURL& GetTabUrl() const override; |
+ virtual const GURL& GetTabReferrerUrl() const override; |
+ virtual std::string GetSuggestedFilename() const override; |
+ virtual std::string GetContentDisposition() const override; |
+ virtual std::string GetMimeType() const override; |
+ virtual std::string GetOriginalMimeType() const override; |
+ virtual std::string GetRemoteAddress() const override; |
+ virtual bool HasUserGesture() const override; |
+ virtual ui::PageTransition GetTransitionType() const override; |
+ virtual const std::string& GetLastModifiedTime() const override; |
+ virtual const std::string& GetETag() const override; |
+ virtual bool IsSavePackageDownload() const override; |
+ virtual const base::FilePath& GetFullPath() const override; |
+ virtual const base::FilePath& GetTargetFilePath() const override; |
+ virtual const base::FilePath& GetForcedFilePath() const override; |
+ virtual base::FilePath GetFileNameToReportUser() const override; |
+ virtual TargetDisposition GetTargetDisposition() const override; |
+ virtual const std::string& GetHash() const override; |
+ virtual const std::string& GetHashState() const override; |
+ virtual bool GetFileExternallyRemoved() const 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; |
+ virtual int64 CurrentSpeed() const override; |
+ virtual int PercentComplete() const override; |
+ virtual bool AllDataSaved() const override; |
+ virtual int64 GetTotalBytes() const override; |
+ virtual int64 GetReceivedBytes() const override; |
+ virtual base::Time GetStartTime() const override; |
+ virtual base::Time GetEndTime() const override; |
+ virtual bool CanShowInFolder() override; |
+ virtual bool CanOpenDownload() override; |
+ virtual bool ShouldOpenFileBasedOnExtension() override; |
+ virtual bool GetOpenWhenComplete() const override; |
+ virtual bool GetAutoOpened() override; |
+ virtual bool GetOpened() const override; |
+ virtual BrowserContext* GetBrowserContext() const override; |
+ virtual WebContents* GetWebContents() const override; |
+ virtual void OnContentCheckCompleted(DownloadDangerType danger_type) override; |
+ virtual void SetOpenWhenComplete(bool open) override; |
+ virtual void SetIsTemporary(bool temporary) override; |
+ virtual void SetOpened(bool opened) override; |
+ virtual void SetDisplayName(const base::FilePath& name) override; |
+ virtual std::string DebugString(bool verbose) const override; |
// All remaining public interfaces virtual to allow for DownloadItemImpl |
// mocks. |
@@ -212,9 +212,9 @@ class CONTENT_EXPORT DownloadItemImpl |
// DownloadDestinationObserver |
virtual void DestinationUpdate(int64 bytes_so_far, |
int64 bytes_per_sec, |
- const std::string& hash_state) OVERRIDE; |
- virtual void DestinationError(DownloadInterruptReason reason) OVERRIDE; |
- virtual void DestinationCompleted(const std::string& final_hash) OVERRIDE; |
+ const std::string& hash_state) override; |
+ virtual void DestinationError(DownloadInterruptReason reason) override; |
+ virtual void DestinationCompleted(const std::string& final_hash) override; |
private: |
// Fine grained states of a download. Note that active downloads are created |