diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 03:41:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 03:41:45 +0000 |
| commit | 650b2d5cdcab7d2c473c00d15b9f343f3a3405bb (patch) | |
| tree | 1343ea25d7d6086ac1279e1e0e32562b3b9b3477 /chrome/browser/chromeos/drive/drive_scheduler.cc | |
| parent | 6f3638708ff440a2e80662ce49acc41cdad51ecd (diff) | |
| download | chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.zip chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.tar.gz chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.tar.bz2 | |
Merge branch 'master' into file_path_browser
version control markers
Merge branch 'master' into file_path_browser
remove version control
Fix typo
Merge branch 'master' into file_path_browser
Conflicts:
chrome/browser/intents/native_services_browsertest.cc
chrome/browser/ui/intents/native_file_picker_service.cc
Merge branch 'master' into file_path_browser
Conflicts:
chrome/browser/chromeos/drive/drive_file_system.cc
chrome/browser/chromeos/drive/drive_file_system.h
chrome/browser/chromeos/drive/drive_file_system_interface.h
chrome/browser/chromeos/drive/drive_file_system_unittest.cc
chrome/browser/chromeos/drive/file_system/drive_operations.cc
chrome/browser/chromeos/login/wallpaper_manager.cc
chrome/browser/chromeos/login/wallpaper_manager.h
chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
chrome/browser/google_apis/gdata_wapi_operations.cc
chrome/browser/google_apis/gdata_wapi_operations.h
chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
chrome/browser/profiles/off_the_record_profile_impl.cc
chrome/browser/profiles/off_the_record_profile_impl.h
chrome/browser/profiles/profile_impl.cc
chrome/browser/profiles/profile_impl.h
chrome/browser/profiles/profile_impl_io_data.cc
chrome/browser/profiles/profile_impl_io_data.h
chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
chrome/browser/ui/webui/options/manage_profile_handler.cc
Long lines
long lines
some long lines.
long lines
long lines
Beginning of lines.
Rename FilePath -> base::FilePath in chrome/browser
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/drive/drive_scheduler.cc')
| -rw-r--r-- | chrome/browser/chromeos/drive/drive_scheduler.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/drive/drive_scheduler.cc b/chrome/browser/chromeos/drive/drive_scheduler.cc index ea62f51..905d441 100644 --- a/chrome/browser/chromeos/drive/drive_scheduler.cc +++ b/chrome/browser/chromeos/drive/drive_scheduler.cc @@ -242,8 +242,8 @@ void DriveScheduler::AddNewDirectory( } void DriveScheduler::DownloadFile( - const FilePath& virtual_path, - const FilePath& local_cache_path, + const base::FilePath& virtual_path, + const base::FilePath& local_cache_path, const GURL& download_url, const google_apis::DownloadActionCallback& download_action_callback, const google_apis::GetContentCallback& get_content_callback) { @@ -263,8 +263,8 @@ void DriveScheduler::DownloadFile( void DriveScheduler::UploadExistingFile( const GURL& upload_location, - const FilePath& drive_file_path, - const FilePath& local_file_path, + const base::FilePath& drive_file_path, + const base::FilePath& local_file_path, const std::string& content_type, const std::string& etag, const google_apis::UploadCompletionCallback& upload_completion_callback) { @@ -636,7 +636,7 @@ void DriveScheduler::OnEntryActionJobDone(int job_id, void DriveScheduler::OnDownloadActionJobDone(int job_id, google_apis::GDataErrorCode error, - const FilePath& temp_file) { + const base::FilePath& temp_file) { DriveFileError drive_error(util::GDataToDriveFileError(error)); scoped_ptr<QueueEntry> job_info = OnJobDone(job_id, drive_error); @@ -652,8 +652,8 @@ void DriveScheduler::OnDownloadActionJobDone(int job_id, void DriveScheduler::OnUploadCompletionJobDone( int job_id, google_apis::DriveUploadError error, - const FilePath& drive_path, - const FilePath& file_path, + const base::FilePath& drive_path, + const base::FilePath& file_path, scoped_ptr<google_apis::ResourceEntry> resource_entry) { DriveFileError drive_error(DriveUploadErrorToDriveFileError(error)); |