diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /content/browser/download/save_file_manager.cc | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
| download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz | |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'content/browser/download/save_file_manager.cc')
| -rw-r--r-- | content/browser/download/save_file_manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index 954fca8927..94fc4c302f 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc @@ -14,8 +14,8 @@ #include "base/threading/thread.h" #include "content/browser/download/save_file.h" #include "content/browser/download/save_package.h" +#include "content/browser/loader/resource_dispatcher_host_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" -#include "content/browser/renderer_host/resource_dispatcher_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" @@ -118,7 +118,7 @@ void SaveFileManager::SaveURL( 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) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -189,7 +189,7 @@ SavePackage* SaveFileManager::GetSavePackageFromRenderIds( return contents->save_package(); } -void SaveFileManager::DeleteDirectoryOrFile(const FilePath& full_path, +void SaveFileManager::DeleteDirectoryOrFile(const base::FilePath& full_path, bool is_dir) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); BrowserThread::PostTask( @@ -450,7 +450,7 @@ void SaveFileManager::SaveLocalFile(const GURL& original_file_url, save_file->Detach(); DCHECK(original_file_url.SchemeIsFile()); - FilePath file_path; + base::FilePath file_path; net::FileURLToFilePath(original_file_url, &file_path); // If we can not get valid file path from original URL, treat it as // disk error. @@ -465,7 +465,7 @@ void SaveFileManager::SaveLocalFile(const GURL& original_file_url, SaveFinished(save_id, original_file_url, render_process_id, success); } -void SaveFileManager::OnDeleteDirectoryOrFile(const FilePath& full_path, +void SaveFileManager::OnDeleteDirectoryOrFile(const base::FilePath& full_path, bool is_dir) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(!full_path.empty()); @@ -475,7 +475,7 @@ void SaveFileManager::OnDeleteDirectoryOrFile(const FilePath& full_path, void SaveFileManager::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) { |