From 2a99a7e74a7f215066514fe81d2bfa6639d9eddd Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Thu, 28 Mar 2013 15:31:22 +0000 Subject: Merge from Chromium at DEPS revision r190564 This commit was generated by merge_to_master.py. Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170 --- content/browser/download/save_file_manager.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'content/browser/download/save_file_manager.h') diff --git a/content/browser/download/save_file_manager.h b/content/browser/download/save_file_manager.h index 73c77117fb..8e3523e696 100644 --- a/content/browser/download/save_file_manager.h +++ b/content/browser/download/save_file_manager.h @@ -66,9 +66,11 @@ #include "content/browser/download/save_types.h" #include "content/common/content_export.h" -class FilePath; class GURL; +namespace base { +class FilePath; +} namespace net { class IOBuffer; @@ -99,7 +101,7 @@ class SaveFileManager : public base::RefCountedThreadSafe { int render_process_host_id, int render_view_id, SaveFileCreateInfo::SaveFileSource save_source, - const FilePath& file_full_path, + const base::FilePath& file_full_path, ResourceContext* context, SavePackage* save_package); @@ -121,7 +123,7 @@ class SaveFileManager : public base::RefCountedThreadSafe { SavePackage* package); // Helper function for deleting specified file. - void DeleteDirectoryOrFile(const FilePath& full_path, bool is_dir); + void DeleteDirectoryOrFile(const base::FilePath& full_path, bool is_dir); // Runs on file thread to save a file by copying from file system when // original url is using file scheme. @@ -134,7 +136,7 @@ class SaveFileManager : public base::RefCountedThreadSafe { // final names of successfully saved files. void RenameAllFiles( const FinalNameList& final_names, - const FilePath& resource_dir, + const base::FilePath& resource_dir, int render_process_id, int render_view_id, int save_package_id); @@ -199,7 +201,7 @@ class SaveFileManager : public base::RefCountedThreadSafe { // Notifications sent from the UI thread and run on the file thread. // Deletes a specified file on the file thread. - void OnDeleteDirectoryOrFile(const FilePath& full_path, bool is_dir); + void OnDeleteDirectoryOrFile(const base::FilePath& full_path, bool is_dir); // Notifications sent from the UI thread and run on the IO thread -- cgit v1.2.3