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 c0756d6040a24b548e09230d66496702ae24697a..ad3ef6d3122adb3eec8d431027f0420ac34144dd 100644 |
--- a/content/browser/download/download_item_impl.h |
+++ b/content/browser/download/download_item_impl.h |
@@ -53,8 +53,8 @@ class CONTENT_EXPORT DownloadItemImpl |
// |bound_net_log| is constructed externally for our use. |
DownloadItemImpl(DownloadItemImplDelegate* delegate, |
DownloadId download_id, |
- const FilePath& current_path, |
- const FilePath& target_path, |
+ const base::FilePath& current_path, |
+ const base::FilePath& target_path, |
const std::vector<GURL>& url_chain, |
const GURL& referrer_url, |
const base::Time& start_time, |
@@ -76,7 +76,7 @@ class CONTENT_EXPORT DownloadItemImpl |
// Constructing for the "Save Page As..." feature: |
// |bound_net_log| is constructed externally for our use. |
DownloadItemImpl(DownloadItemImplDelegate* delegate, |
- const FilePath& path, |
+ const base::FilePath& path, |
const GURL& url, |
DownloadId download_id, |
const std::string& mime_type, |
@@ -122,11 +122,11 @@ class CONTENT_EXPORT DownloadItemImpl |
virtual const std::string& GetLastModifiedTime() const OVERRIDE; |
virtual const std::string& GetETag() const OVERRIDE; |
virtual bool IsSavePackageDownload() const OVERRIDE; |
- virtual const FilePath& GetFullPath() const OVERRIDE; |
- virtual const FilePath& GetTargetFilePath() const OVERRIDE; |
- virtual const FilePath& GetForcedFilePath() const OVERRIDE; |
- virtual FilePath GetUserVerifiedFilePath() const OVERRIDE; |
- virtual FilePath GetFileNameToReportUser() 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 GetUserVerifiedFilePath() 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; |
@@ -153,7 +153,7 @@ class CONTENT_EXPORT DownloadItemImpl |
virtual void SetOpenWhenComplete(bool open) OVERRIDE; |
virtual void SetIsTemporary(bool temporary) OVERRIDE; |
virtual void SetOpened(bool opened) OVERRIDE; |
- virtual void SetDisplayName(const FilePath& name) 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 |
@@ -261,16 +261,16 @@ class CONTENT_EXPORT DownloadItemImpl |
// |target_path| as determined by the caller. |intermediate_path| is the path |
// to use to store the download until OnDownloadCompleting() is called. |
virtual void OnDownloadTargetDetermined( |
- const FilePath& target_path, |
+ const base::FilePath& target_path, |
TargetDisposition disposition, |
DownloadDangerType danger_type, |
- const FilePath& intermediate_path); |
+ const base::FilePath& intermediate_path); |
// Callback from file thread when we initialize the DownloadFile. |
void OnDownloadFileInitialized(DownloadInterruptReason result); |
void OnDownloadRenamedToIntermediateName( |
- DownloadInterruptReason reason, const FilePath& full_path); |
+ DownloadInterruptReason reason, const base::FilePath& full_path); |
// If all pre-requisites have been met, complete download processing, i.e. do |
// internal cleanup, file rename, and potentially auto-open. (Dangerous |
@@ -283,7 +283,7 @@ class CONTENT_EXPORT DownloadItemImpl |
void OnDownloadCompleting(); |
void OnDownloadRenamedToFinalName(DownloadInterruptReason reason, |
- const FilePath& full_path); |
+ const base::FilePath& full_path); |
// Called if the embedder took over opening a download, to indicate that |
// the download has been opened. |
@@ -312,7 +312,7 @@ class CONTENT_EXPORT DownloadItemImpl |
// Set the |danger_type_| and invoke obserers if necessary. |
void SetDangerType(DownloadDangerType danger_type); |
- void SetFullPath(const FilePath& new_path); |
+ void SetFullPath(const base::FilePath& new_path); |
void AutoResumeIfValid(); |
@@ -338,18 +338,18 @@ class CONTENT_EXPORT DownloadItemImpl |
// Display name for the download. If this is empty, then the display name is |
// considered to be |target_path_.BaseName()|. |
- FilePath display_name_; |
+ base::FilePath display_name_; |
// Full path to the downloaded or downloading file. This is the path to the |
// physical file, if one exists. The final target path is specified by |
// |target_path_|. |current_path_| can be empty if the in-progress path hasn't |
// been determined. |
- FilePath current_path_; |
+ base::FilePath current_path_; |
// Target path of an in-progress download. We may be downloading to a |
// temporary or intermediate file (specified by |current_path_|. Once the |
// download completes, we will rename the file to |target_path_|. |
- FilePath target_path_; |
+ base::FilePath target_path_; |
// Whether the target should be overwritten, uniquified or prompted for. |
TargetDisposition target_disposition_; |
@@ -367,7 +367,7 @@ class CONTENT_EXPORT DownloadItemImpl |
// If non-empty, contains an externally supplied path that should be used as |
// the target path. |
- FilePath forced_file_path_; |
+ base::FilePath forced_file_path_; |
// Page transition that triggerred the download. |
PageTransition transition_type_; |