chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h - Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase on master Created 6 years, 2 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/sync_file_system/drive_backend/drive_uploader_on_worker.h ('k') | chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3d4774d0f79a768df2ac6ed0640fc1b7c9b9b102..7ff3652009495be63effc23378717e79bb9906fa 100644

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

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

@@ -30,7 +30,7 @@ class FakeDriveServiceWrapper : public drive::FakeDriveService {

const std::string& parent_resource_id,

const std::string& directory_name,

const AddNewDirectoryOptions& options,

- const google_apis::FileResourceCallback& callback) OVERRIDE;

+ const google_apis::FileResourceCallback& callback) override;

void set_make_directory_conflict(bool enable) {

make_directory_conflict_ = enable;

@@ -57,20 +57,20 @@ class FakeDriveUploader : public drive::DriveUploaderInterface {

const std::string& content_type,

const UploadNewFileOptions& options,

const drive::UploadCompletionCallback& callback,

- const google_apis::ProgressCallback& progress_callback) OVERRIDE;

+ const google_apis::ProgressCallback& progress_callback) override;

virtual google_apis::CancelCallback UploadExistingFile(

const std::string& resource_id,

const base::FilePath& local_file_path,

const std::string& content_type,

const UploadExistingFileOptions& options,

const drive::UploadCompletionCallback& callback,

- const google_apis::ProgressCallback& progress_callback) OVERRIDE;

+ const google_apis::ProgressCallback& progress_callback) override;

virtual google_apis::CancelCallback ResumeUploadFile(

const GURL& upload_location,

const base::FilePath& local_file_path,

const std::string& content_type,

const drive::UploadCompletionCallback& callback,

- const google_apis::ProgressCallback& progress_callback) OVERRIDE;

+ const google_apis::ProgressCallback& progress_callback) override;

void set_make_file_conflict(bool enable) {

make_file_conflict_ = enable;