| Index: base/prefs/json_pref_store.h
|
| diff --git a/base/prefs/json_pref_store.h b/base/prefs/json_pref_store.h
|
| index 7f26c89867e6433d58e53c4279557a3aafcb29b0..7adb32007c05949d8bc77d6cf641bae5af5f343b 100644
|
| --- a/base/prefs/json_pref_store.h
|
| +++ b/base/prefs/json_pref_store.h
|
| @@ -66,29 +66,27 @@ class BASE_PREFS_EXPORT JsonPrefStore
|
| scoped_ptr<PrefFilter> pref_filter);
|
|
|
| // PrefStore overrides:
|
| - virtual bool GetValue(const std::string& key,
|
| - const base::Value** result) const OVERRIDE;
|
| - virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE;
|
| - virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE;
|
| - virtual bool HasObservers() const OVERRIDE;
|
| - virtual bool IsInitializationComplete() const OVERRIDE;
|
| + bool GetValue(const std::string& key,
|
| + const base::Value** result) const override;
|
| + void AddObserver(PrefStore::Observer* observer) override;
|
| + void RemoveObserver(PrefStore::Observer* observer) override;
|
| + bool HasObservers() const override;
|
| + bool IsInitializationComplete() const override;
|
|
|
| // PersistentPrefStore overrides:
|
| - virtual bool GetMutableValue(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 GetReadError() const OVERRIDE;
|
| + bool GetMutableValue(const std::string& key, base::Value** result) override;
|
| + void SetValue(const std::string& key, base::Value* value) override;
|
| + void SetValueSilently(const std::string& key, base::Value* value) override;
|
| + void RemoveValue(const std::string& key) override;
|
| + bool ReadOnly() const override;
|
| + PrefReadError GetReadError() const override;
|
| // Note this method may be asynchronous if this instance has a |pref_filter_|
|
| // in which case it will return PREF_READ_ERROR_ASYNCHRONOUS_TASK_INCOMPLETE.
|
| // See details in pref_filter.h.
|
| - virtual PrefReadError ReadPrefs() OVERRIDE;
|
| - virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;
|
| - virtual void CommitPendingWrite() OVERRIDE;
|
| - virtual void ReportValueChanged(const std::string& key) OVERRIDE;
|
| + PrefReadError ReadPrefs() override;
|
| + void ReadPrefsAsync(ReadErrorDelegate* error_delegate) override;
|
| + void CommitPendingWrite() override;
|
| + void ReportValueChanged(const std::string& key) override;
|
|
|
| // Just like RemoveValue(), but doesn't notify observers. Used when doing some
|
| // cleanup that shouldn't otherwise alert observers.
|
| @@ -111,7 +109,7 @@ class BASE_PREFS_EXPORT JsonPrefStore
|
| void OnFileRead(scoped_ptr<ReadResult> read_result);
|
|
|
| // ImportantFileWriter::DataSerializer overrides:
|
| - virtual bool SerializeData(std::string* output) OVERRIDE;
|
| + bool SerializeData(std::string* output) override;
|
|
|
| // This method is called after the JSON file has been read and the result has
|
| // potentially been intercepted and modified by |pref_filter_|.
|
|
|