chrome/browser/sync/glue/non_frontend_data_type_controller.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/glue/non_frontend_data_type_controller.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/glue/local_device_info_provider_unittest.cc ('k') | chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/non_frontend_data_type_controller.h

diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.h b/chrome/browser/sync/glue/non_frontend_data_type_controller.h

index e2e5043f91d7b9fd35c19f88be8f1c341666dbfb..bcb5b616a12b8fedd735c5046801340004f5ee9e 100644

--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.h

+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.h

@@ -58,18 +58,18 @@ class NonFrontendDataTypeController : public sync_driver::DataTypeController {

// DataTypeController interface.

virtual void LoadModels(

- const ModelLoadCallback& model_load_callback) OVERRIDE;

- virtual void StartAssociating(const StartCallback& start_callback) OVERRIDE;

- virtual void Stop() OVERRIDE;

+ const ModelLoadCallback& model_load_callback) override;

+ virtual void StartAssociating(const StartCallback& start_callback) override;

+ virtual void Stop() override;

virtual syncer::ModelType type() const = 0;

virtual syncer::ModelSafeGroup model_safe_group() const = 0;

- virtual std::string name() const OVERRIDE;

- virtual State state() const OVERRIDE;

+ virtual std::string name() const override;

+ virtual State state() const override;

// DataTypeErrorHandler interface.

// Note: this is performed on the datatype's thread.

virtual void OnSingleDataTypeUnrecoverableError(

- const syncer::SyncError& error) OVERRIDE;

+ const syncer::SyncError& error) override;

// Callback to receive background association results.

struct AssociationResult {

@@ -94,7 +94,7 @@ class NonFrontendDataTypeController : public sync_driver::DataTypeController {

virtual ~NonFrontendDataTypeController();

// DataTypeController interface.

- virtual void OnModelLoaded() OVERRIDE;

+ virtual void OnModelLoaded() override;

// Start any dependent services that need to be running before we can

// associate models. The default implementation is a no-op.

@@ -168,7 +168,7 @@ class NonFrontendDataTypeController : public sync_driver::DataTypeController {

void set_state(State state);

virtual sync_driver::AssociatorInterface* associator() const;

- virtual sync_driver::ChangeProcessor* GetChangeProcessor() const OVERRIDE;

+ virtual sync_driver::ChangeProcessor* GetChangeProcessor() const override;

State state_;

StartCallback start_callback_;