chrome/browser/supervised_user/supervised_user_settings_service.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/supervised_user/supervised_user_settings_service.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/supervised_user/supervised_user_service_unittest.cc ('k') | chrome/browser/supervised_user/supervised_user_settings_service_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_settings_service.h

diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.h b/chrome/browser/supervised_user/supervised_user_settings_service.h

index 0d4b11b8e444b93b92447dc48d44cdde2790053c..e600c794727574ee5eb5992d8da9e7a643ea7baa 100644

--- a/chrome/browser/supervised_user/supervised_user_settings_service.h

+++ b/chrome/browser/supervised_user/supervised_user_settings_service.h

@@ -109,24 +109,24 @@ class SupervisedUserSettingsService : public KeyedService,

const base::Value& value);

// KeyedService implementation:

- virtual void Shutdown() OVERRIDE;

+ virtual void Shutdown() override;

// SyncableService implementation:

virtual syncer::SyncMergeResult MergeDataAndStartSyncing(

syncer::ModelType type,

const syncer::SyncDataList& initial_sync_data,

scoped_ptr<syncer::SyncChangeProcessor> sync_processor,

- scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE;

- virtual void StopSyncing(syncer::ModelType type) OVERRIDE;

+ scoped_ptr<syncer::SyncErrorFactory> error_handler) override;

+ virtual void StopSyncing(syncer::ModelType type) override;

virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const

- OVERRIDE;

+ override;

virtual syncer::SyncError ProcessSyncChanges(

const tracked_objects::Location& from_here,

- const syncer::SyncChangeList& change_list) OVERRIDE;

+ const syncer::SyncChangeList& change_list) override;

// PrefStore::Observer implementation:

- virtual void OnPrefValueChanged(const std::string& key) OVERRIDE;

- virtual void OnInitializationCompleted(bool success) OVERRIDE;

+ virtual void OnPrefValueChanged(const std::string& key) override;

+ virtual void OnInitializationCompleted(bool success) override;

private:

base::DictionaryValue* GetOrCreateDictionary(const std::string& key) const;