| Index: chrome/browser/drive/drive_api_service.h
|
| diff --git a/chrome/browser/drive/drive_api_service.h b/chrome/browser/drive/drive_api_service.h
|
| index 0f235f137ab28b2f2cf6f42f7d95ad63da2c9bbe..569d89aa1810ae5b712d0b13576ded925985ecde 100644
|
| --- a/chrome/browser/drive/drive_api_service.h
|
| +++ b/chrome/browser/drive/drive_api_service.h
|
| @@ -59,105 +59,105 @@ class DriveAPIService : public DriveServiceInterface,
|
| const GURL& base_download_url,
|
| const GURL& wapi_base_url,
|
| const std::string& custom_user_agent);
|
| - virtual ~DriveAPIService();
|
| + ~DriveAPIService() override;
|
|
|
| // DriveServiceInterface Overrides
|
| - virtual void Initialize(const std::string& account_id) override;
|
| - virtual void AddObserver(DriveServiceObserver* observer) override;
|
| - virtual void RemoveObserver(DriveServiceObserver* observer) override;
|
| - virtual bool CanSendRequest() const override;
|
| - virtual bool HasAccessToken() const override;
|
| - virtual void RequestAccessToken(
|
| + void Initialize(const std::string& account_id) override;
|
| + void AddObserver(DriveServiceObserver* observer) override;
|
| + void RemoveObserver(DriveServiceObserver* observer) override;
|
| + bool CanSendRequest() const override;
|
| + bool HasAccessToken() const override;
|
| + void RequestAccessToken(
|
| const google_apis::AuthStatusCallback& callback) override;
|
| - virtual bool HasRefreshToken() const override;
|
| - virtual void ClearAccessToken() override;
|
| - virtual void ClearRefreshToken() override;
|
| - virtual std::string GetRootResourceId() const override;
|
| - virtual google_apis::CancelCallback GetAllFileList(
|
| + bool HasRefreshToken() const override;
|
| + void ClearAccessToken() override;
|
| + void ClearRefreshToken() override;
|
| + std::string GetRootResourceId() const override;
|
| + google_apis::CancelCallback GetAllFileList(
|
| const google_apis::FileListCallback& callback) override;
|
| - virtual google_apis::CancelCallback GetFileListInDirectory(
|
| + google_apis::CancelCallback GetFileListInDirectory(
|
| const std::string& directory_resource_id,
|
| const google_apis::FileListCallback& callback) override;
|
| - virtual google_apis::CancelCallback Search(
|
| + google_apis::CancelCallback Search(
|
| const std::string& search_query,
|
| const google_apis::FileListCallback& callback) override;
|
| - virtual google_apis::CancelCallback SearchByTitle(
|
| + google_apis::CancelCallback SearchByTitle(
|
| const std::string& title,
|
| const std::string& directory_resource_id,
|
| const google_apis::FileListCallback& callback) override;
|
| - virtual google_apis::CancelCallback GetChangeList(
|
| + google_apis::CancelCallback GetChangeList(
|
| int64 start_changestamp,
|
| const google_apis::ChangeListCallback& callback) override;
|
| - virtual google_apis::CancelCallback GetRemainingChangeList(
|
| + google_apis::CancelCallback GetRemainingChangeList(
|
| const GURL& next_link,
|
| const google_apis::ChangeListCallback& callback) override;
|
| - virtual google_apis::CancelCallback GetRemainingFileList(
|
| + google_apis::CancelCallback GetRemainingFileList(
|
| const GURL& next_link,
|
| const google_apis::FileListCallback& callback) override;
|
| - virtual google_apis::CancelCallback GetFileResource(
|
| + google_apis::CancelCallback GetFileResource(
|
| const std::string& resource_id,
|
| const google_apis::FileResourceCallback& callback) override;
|
| - virtual google_apis::CancelCallback GetShareUrl(
|
| + google_apis::CancelCallback GetShareUrl(
|
| const std::string& resource_id,
|
| const GURL& embed_origin,
|
| const google_apis::GetShareUrlCallback& callback) override;
|
| - virtual google_apis::CancelCallback GetAboutResource(
|
| + google_apis::CancelCallback GetAboutResource(
|
| const google_apis::AboutResourceCallback& callback) override;
|
| - virtual google_apis::CancelCallback GetAppList(
|
| + google_apis::CancelCallback GetAppList(
|
| const google_apis::AppListCallback& callback) override;
|
| - virtual google_apis::CancelCallback DeleteResource(
|
| + google_apis::CancelCallback DeleteResource(
|
| const std::string& resource_id,
|
| const std::string& etag,
|
| const google_apis::EntryActionCallback& callback) override;
|
| - virtual google_apis::CancelCallback TrashResource(
|
| + google_apis::CancelCallback TrashResource(
|
| const std::string& resource_id,
|
| const google_apis::EntryActionCallback& callback) override;
|
| - virtual google_apis::CancelCallback DownloadFile(
|
| + google_apis::CancelCallback DownloadFile(
|
| const base::FilePath& local_cache_path,
|
| const std::string& resource_id,
|
| const google_apis::DownloadActionCallback& download_action_callback,
|
| const google_apis::GetContentCallback& get_content_callback,
|
| const google_apis::ProgressCallback& progress_callback) override;
|
| - virtual google_apis::CancelCallback CopyResource(
|
| + google_apis::CancelCallback CopyResource(
|
| const std::string& resource_id,
|
| const std::string& parent_resource_id,
|
| const std::string& new_title,
|
| const base::Time& last_modified,
|
| const google_apis::FileResourceCallback& callback) override;
|
| - virtual google_apis::CancelCallback UpdateResource(
|
| + google_apis::CancelCallback UpdateResource(
|
| const std::string& resource_id,
|
| const std::string& parent_resource_id,
|
| const std::string& new_title,
|
| const base::Time& last_modified,
|
| const base::Time& last_viewed_by_me,
|
| const google_apis::FileResourceCallback& callback) override;
|
| - virtual google_apis::CancelCallback AddResourceToDirectory(
|
| + google_apis::CancelCallback AddResourceToDirectory(
|
| const std::string& parent_resource_id,
|
| const std::string& resource_id,
|
| const google_apis::EntryActionCallback& callback) override;
|
| - virtual google_apis::CancelCallback RemoveResourceFromDirectory(
|
| + google_apis::CancelCallback RemoveResourceFromDirectory(
|
| const std::string& parent_resource_id,
|
| const std::string& resource_id,
|
| const google_apis::EntryActionCallback& callback) override;
|
| - virtual google_apis::CancelCallback AddNewDirectory(
|
| + google_apis::CancelCallback AddNewDirectory(
|
| const std::string& parent_resource_id,
|
| const std::string& directory_title,
|
| const AddNewDirectoryOptions& options,
|
| const google_apis::FileResourceCallback& callback) override;
|
| - virtual google_apis::CancelCallback InitiateUploadNewFile(
|
| + google_apis::CancelCallback InitiateUploadNewFile(
|
| const std::string& content_type,
|
| int64 content_length,
|
| const std::string& parent_resource_id,
|
| const std::string& title,
|
| const InitiateUploadNewFileOptions& options,
|
| const google_apis::InitiateUploadCallback& callback) override;
|
| - virtual google_apis::CancelCallback InitiateUploadExistingFile(
|
| + google_apis::CancelCallback InitiateUploadExistingFile(
|
| const std::string& content_type,
|
| int64 content_length,
|
| const std::string& resource_id,
|
| const InitiateUploadExistingFileOptions& options,
|
| const google_apis::InitiateUploadCallback& callback) override;
|
| - virtual google_apis::CancelCallback ResumeUpload(
|
| + google_apis::CancelCallback ResumeUpload(
|
| const GURL& upload_url,
|
| int64 start_position,
|
| int64 end_position,
|
| @@ -166,18 +166,18 @@ class DriveAPIService : public DriveServiceInterface,
|
| const base::FilePath& local_file_path,
|
| const google_apis::drive::UploadRangeCallback& callback,
|
| const google_apis::ProgressCallback& progress_callback) override;
|
| - virtual google_apis::CancelCallback GetUploadStatus(
|
| + google_apis::CancelCallback GetUploadStatus(
|
| const GURL& upload_url,
|
| int64 content_length,
|
| const google_apis::drive::UploadRangeCallback& callback) override;
|
| - virtual google_apis::CancelCallback AuthorizeApp(
|
| + google_apis::CancelCallback AuthorizeApp(
|
| const std::string& resource_id,
|
| const std::string& app_id,
|
| const google_apis::AuthorizeAppCallback& callback) override;
|
| - virtual google_apis::CancelCallback UninstallApp(
|
| + google_apis::CancelCallback UninstallApp(
|
| const std::string& app_id,
|
| const google_apis::EntryActionCallback& callback) override;
|
| - virtual google_apis::CancelCallback AddPermission(
|
| + google_apis::CancelCallback AddPermission(
|
| const std::string& resource_id,
|
| const std::string& email,
|
| google_apis::drive::PermissionRole role,
|
| @@ -185,7 +185,7 @@ class DriveAPIService : public DriveServiceInterface,
|
|
|
| private:
|
| // AuthServiceObserver override.
|
| - virtual void OnOAuth2RefreshTokenChanged() override;
|
| + void OnOAuth2RefreshTokenChanged() override;
|
|
|
| OAuth2TokenService* oauth2_token_service_;
|
| scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
|
|
|