chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h - Issue 1042803002: Drive: Move inner structures of DriveAPIService under drive namespace.

Unified Diff: chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h

Issue 1042803002: Drive: Move inner structures of DriveAPIService under drive namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests. Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc ('k') | chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h

diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h

index 0aa5ff4828d78bf8aff25dd9f37a1d9033bc42f0..8a55d91ad59e28e7f81eaa1b2431a3cad0474138 100644

--- a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h

+++ b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h

@@ -35,7 +35,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {

google_apis::CancelCallback AddNewDirectory(

const std::string& parent_resource_id,

const std::string& directory_title,

- const AddNewDirectoryOptions& options,

+ const drive::AddNewDirectoryOptions& options,

const google_apis::FileResourceCallback& callback) override;

google_apis::CancelCallback DeleteResource(

@@ -134,13 +134,13 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {

int64 content_length,

const std::string& parent_resource_id,

const std::string& title,

- const UploadNewFileOptions& options,

+ const drive::UploadNewFileOptions& options,

const google_apis::InitiateUploadCallback& callback) override;

google_apis::CancelCallback InitiateUploadExistingFile(

const std::string& content_type,

int64 content_length,

const std::string& resource_id,

- const UploadExistingFileOptions& options,

+ const drive::UploadExistingFileOptions& options,

const google_apis::InitiateUploadCallback& callback) override;

google_apis::CancelCallback ResumeUpload(

const GURL& upload_url,

@@ -161,7 +161,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {

const std::string& parent_resource_id,

const std::string& title,

const base::FilePath& local_file_path,

- const UploadNewFileOptions& options,

+ const drive::UploadNewFileOptions& options,

const google_apis::FileResourceCallback& callback,

const google_apis::ProgressCallback& progress_callback) override;

google_apis::CancelCallback MultipartUploadExistingFile(

@@ -169,7 +169,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {

int64 content_length,

const std::string& resource_id,

const base::FilePath& local_file_path,

- const UploadExistingFileOptions& options,

+ const drive::UploadExistingFileOptions& options,

const google_apis::FileResourceCallback& callback,

const google_apis::ProgressCallback& progress_callback) override;

google_apis::CancelCallback AuthorizeApp(