diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 16:52:21 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 16:52:21 +0000 |
commit | 49fd7e2236c370b3affab9788fa5fc4c998729a1 (patch) | |
tree | 204eaa4196e3e9a6b173253a146b9104f0108da2 /chrome/browser/prefs | |
parent | 0d5c08e06dc7c5e0f2895134cdd9c34c2402551c (diff) | |
download | chromium_src-49fd7e2236c370b3affab9788fa5fc4c998729a1.zip chromium_src-49fd7e2236c370b3affab9788fa5fc4c998729a1.tar.gz chromium_src-49fd7e2236c370b3affab9788fa5fc4c998729a1.tar.bz2 |
Add OVERRIDE to chrome/browser/.
BUG=104314
TEST=no change
Review URL: http://codereview.chromium.org/8614003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r-- | chrome/browser/prefs/overlay_user_pref_store.h | 35 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_member.h | 2 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_notifier_impl.h | 4 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_set_observer.h | 2 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_value_store.h | 4 | ||||
-rw-r--r-- | chrome/browser/prefs/testing_pref_store.h | 31 | ||||
-rw-r--r-- | chrome/browser/prefs/value_map_pref_store.h | 6 |
7 files changed, 43 insertions, 41 deletions
diff --git a/chrome/browser/prefs/overlay_user_pref_store.h b/chrome/browser/prefs/overlay_user_pref_store.h index 88d6e2c..eb2cac7 100644 --- a/chrome/browser/prefs/overlay_user_pref_store.h +++ b/chrome/browser/prefs/overlay_user_pref_store.h @@ -31,25 +31,26 @@ class OverlayUserPrefStore : public PersistentPrefStore, virtual bool IsSetInOverlay(const std::string& key) const; // Methods of PrefStore. - virtual void AddObserver(PrefStore::Observer* observer); - virtual void RemoveObserver(PrefStore::Observer* observer); - virtual bool IsInitializationComplete() const; + virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE; + virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE; + virtual bool IsInitializationComplete() const OVERRIDE; virtual ReadResult GetValue(const std::string& key, - const base::Value** result) const; + const base::Value** result) const OVERRIDE; // Methods of PersistentPrefStore. virtual ReadResult GetMutableValue(const std::string& key, - base::Value** result); - virtual void SetValue(const std::string& key, base::Value* value); - virtual void SetValueSilently(const std::string& key, base::Value* value); - virtual void RemoveValue(const std::string& key); - virtual bool ReadOnly() const; - virtual PrefReadError ReadPrefs(); - virtual void ReadPrefsAsync(ReadErrorDelegate* delegate); - virtual bool WritePrefs(); - virtual void ScheduleWritePrefs(); - virtual void CommitPendingWrite(); - virtual void ReportValueChanged(const std::string& key); + base::Value** result) OVERRIDE; + virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE; + virtual void SetValueSilently(const std::string& key, + base::Value* value) OVERRIDE; + virtual void RemoveValue(const std::string& key) OVERRIDE; + virtual bool ReadOnly() const OVERRIDE; + virtual PrefReadError ReadPrefs() OVERRIDE; + virtual void ReadPrefsAsync(ReadErrorDelegate* delegate) OVERRIDE; + virtual bool WritePrefs() OVERRIDE; + virtual void ScheduleWritePrefs() OVERRIDE; + virtual void CommitPendingWrite() OVERRIDE; + virtual void ReportValueChanged(const std::string& key) OVERRIDE; protected: void RegisterOverlayProperty(const std::string& key); @@ -62,8 +63,8 @@ class OverlayUserPrefStore : public PersistentPrefStore, typedef std::map<std::string, std::string> NamesMap; // Methods of PrefStore::Observer. - virtual void OnPrefValueChanged(const std::string& key); - virtual void OnInitializationCompleted(bool succeeded); + virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; + virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; const std::string& GetOverlayKey(const std::string& underlay_key) const; const std::string& GetUnderlayKey(const std::string& overlay_key) const; diff --git a/chrome/browser/prefs/pref_member.h b/chrome/browser/prefs/pref_member.h index bb3434f..38c785a 100644 --- a/chrome/browser/prefs/pref_member.h +++ b/chrome/browser/prefs/pref_member.h @@ -94,7 +94,7 @@ class PrefMemberBase : public content::NotificationObserver { // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; void VerifyValuePrefName() const { DCHECK(!pref_name_.empty()); diff --git a/chrome/browser/prefs/pref_notifier_impl.h b/chrome/browser/prefs/pref_notifier_impl.h index b16ad11..e687a56 100644 --- a/chrome/browser/prefs/pref_notifier_impl.h +++ b/chrome/browser/prefs/pref_notifier_impl.h @@ -32,8 +32,8 @@ class PrefNotifierImpl : public PrefNotifier, void RemovePrefObserver(const char* path, content::NotificationObserver* obs); // PrefNotifier overrides. - virtual void OnPreferenceChanged(const std::string& pref_name); - virtual void OnInitializationCompleted(bool succeeded); + virtual void OnPreferenceChanged(const std::string& pref_name) OVERRIDE; + virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; protected: // A map from pref names to a list of observers. Observers get fired in the diff --git a/chrome/browser/prefs/pref_set_observer.h b/chrome/browser/prefs/pref_set_observer.h index 557bd83..acf02f3 100644 --- a/chrome/browser/prefs/pref_set_observer.h +++ b/chrome/browser/prefs/pref_set_observer.h @@ -46,7 +46,7 @@ class PrefSetObserver : public content::NotificationObserver { // Overridden from content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; typedef std::set<std::string> PrefSet; PrefSet prefs_; diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h index 6037633..b750296 100644 --- a/chrome/browser/prefs/pref_value_store.h +++ b/chrome/browser/prefs/pref_value_store.h @@ -153,8 +153,8 @@ class PrefValueStore { private: // PrefStore::Observer implementation. - virtual void OnPrefValueChanged(const std::string& key); - virtual void OnInitializationCompleted(bool succeeded); + virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; + virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; // PrefValueStore this keeper is part of. PrefValueStore* pref_value_store_; diff --git a/chrome/browser/prefs/testing_pref_store.h b/chrome/browser/prefs/testing_pref_store.h index 106b836..6770352 100644 --- a/chrome/browser/prefs/testing_pref_store.h +++ b/chrome/browser/prefs/testing_pref_store.h @@ -22,24 +22,25 @@ class TestingPrefStore : public PersistentPrefStore { // Overriden from PrefStore. virtual ReadResult GetValue(const std::string& key, - const base::Value** result) const; - virtual void AddObserver(PrefStore::Observer* observer); - virtual void RemoveObserver(PrefStore::Observer* observer); - virtual bool IsInitializationComplete() const; + const base::Value** result) const OVERRIDE; + virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE; + virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE; + virtual bool IsInitializationComplete() const OVERRIDE; // PersistentPrefStore overrides: virtual ReadResult GetMutableValue(const std::string& key, - base::Value** result); - virtual void ReportValueChanged(const std::string& key); - virtual void SetValue(const std::string& key, base::Value* value); - virtual void SetValueSilently(const std::string& key, base::Value* value); - virtual void RemoveValue(const std::string& key); - virtual bool ReadOnly() const; - virtual PersistentPrefStore::PrefReadError ReadPrefs(); - virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate); - virtual bool WritePrefs(); - virtual void ScheduleWritePrefs() {} - virtual void CommitPendingWrite() {} + base::Value** result) OVERRIDE; + virtual void ReportValueChanged(const std::string& key) OVERRIDE; + virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE; + virtual void SetValueSilently(const std::string& key, + base::Value* value) OVERRIDE; + virtual void RemoveValue(const std::string& key) OVERRIDE; + virtual bool ReadOnly() const OVERRIDE; + virtual PersistentPrefStore::PrefReadError ReadPrefs() OVERRIDE; + virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE; + virtual bool WritePrefs() OVERRIDE; + virtual void ScheduleWritePrefs() OVERRIDE {} + virtual void CommitPendingWrite() OVERRIDE {} // Marks the store as having completed initialization. void SetInitializationCompleted(); diff --git a/chrome/browser/prefs/value_map_pref_store.h b/chrome/browser/prefs/value_map_pref_store.h index 1898055..0981a6f 100644 --- a/chrome/browser/prefs/value_map_pref_store.h +++ b/chrome/browser/prefs/value_map_pref_store.h @@ -23,9 +23,9 @@ class ValueMapPrefStore : public PrefStore { // PrefStore overrides: virtual ReadResult GetValue(const std::string& key, - const base::Value** value) const; - virtual void AddObserver(PrefStore::Observer* observer); - virtual void RemoveObserver(PrefStore::Observer* observer); + const base::Value** value) const OVERRIDE; + virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE; + virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE; iterator begin(); iterator end(); |