chrome/browser/sync_file_system/drive_backend/conflict_resolver.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/conflict_resolver.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/test_profile_sync_service.h ('k') | chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e18a869d76c853cbed18696b52a6e86708a14839..2bbb1892698a5fb599088aa7710b55a35e0a046d 100644

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

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

@@ -42,7 +42,7 @@ class ConflictResolver : public SyncTask {

explicit ConflictResolver(SyncEngineContext* sync_context);

virtual ~ConflictResolver();

- virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) OVERRIDE;

+ virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) override;

void RunExclusive(scoped_ptr<SyncTaskToken> token);

private: