chrome/browser/prefs/tracked/segregated_pref_store.h - Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]*

Unified Diff: chrome/browser/prefs/tracked/segregated_pref_store.h

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (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/prefs/tracked/pref_service_hash_store_contents_unittest.cc ('k') | chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/tracked/segregated_pref_store.h

diff --git a/chrome/browser/prefs/tracked/segregated_pref_store.h b/chrome/browser/prefs/tracked/segregated_pref_store.h

index fc8ef9186bfd41c8673ad3ee04499a0950bc69df..aea3a3bc3c0887feb63e04eb83fbd9f0746e9ff4 100644

--- a/chrome/browser/prefs/tracked/segregated_pref_store.h

+++ b/chrome/browser/prefs/tracked/segregated_pref_store.h

@@ -44,28 +44,28 @@ class SegregatedPrefStore : public PersistentPrefStore {

const std::set<std::string>& selected_pref_names);

// PrefStore implementation

- virtual void AddObserver(Observer* observer) OVERRIDE;

- virtual void RemoveObserver(Observer* observer) OVERRIDE;

- virtual bool HasObservers() const OVERRIDE;

- virtual bool IsInitializationComplete() const OVERRIDE;

+ virtual void AddObserver(Observer* observer) override;

+ virtual void RemoveObserver(Observer* observer) override;

+ virtual bool HasObservers() const override;

+ virtual bool IsInitializationComplete() const override;

virtual bool GetValue(const std::string& key,

- const base::Value** result) const OVERRIDE;

+ const base::Value** result) const override;

// WriteablePrefStore implementation

- virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE;

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

+ virtual void SetValue(const std::string& key, base::Value* value) override;

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

// PersistentPrefStore implementation

virtual bool GetMutableValue(const std::string& key,

- base::Value** result) OVERRIDE;

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

+ base::Value** result) override;

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

virtual void SetValueSilently(const std::string& key,

- base::Value* value) OVERRIDE;

- virtual bool ReadOnly() const OVERRIDE;

- virtual PrefReadError GetReadError() const OVERRIDE;

- virtual PrefReadError ReadPrefs() OVERRIDE;

- virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;

- virtual void CommitPendingWrite() OVERRIDE;

+ base::Value* value) override;

+ virtual bool ReadOnly() const override;

+ virtual PrefReadError GetReadError() const override;

+ virtual PrefReadError ReadPrefs() override;

+ virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) override;

+ virtual void CommitPendingWrite() override;

private:

// Aggregates events from the underlying stores and synthesizes external

@@ -75,8 +75,8 @@ class SegregatedPrefStore : public PersistentPrefStore {

explicit AggregatingObserver(SegregatedPrefStore* outer);

// PrefStore::Observer implementation

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

- virtual void OnInitializationCompleted(bool succeeded) OVERRIDE;

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

+ virtual void OnInitializationCompleted(bool succeeded) override;

private:

SegregatedPrefStore* outer_;