| Index: chrome/common/json_pref_store.h
|
| diff --git a/chrome/common/json_pref_store.h b/chrome/common/json_pref_store.h
|
| index 3cbd3520bdb676276b08eda23033fa761ac0e575..b94030d806878bfedf8fa600ade4dae4f4175d28 100644
|
| --- a/chrome/common/json_pref_store.h
|
| +++ b/chrome/common/json_pref_store.h
|
| @@ -42,19 +42,17 @@ class JsonPrefStore : public PersistentPrefStore,
|
|
|
| // PersistentPrefStore overrides:
|
| virtual ReadResult 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 ReadPrefs() OVERRIDE;
|
| - virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;
|
| - virtual bool WritePrefs() OVERRIDE;
|
| - virtual void ScheduleWritePrefs() OVERRIDE;
|
| - virtual void CommitPendingWrite() OVERRIDE;
|
| - virtual void ReportValueChanged(const std::string& key) OVERRIDE;
|
| - virtual void CheckIfValueDestroyed(const std::string& key) OVERRIDE;
|
| + 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* error_delegate);
|
| + virtual bool WritePrefs();
|
| + virtual void ScheduleWritePrefs();
|
| + virtual void CommitPendingWrite();
|
| + virtual void ReportValueChanged(const std::string& key);
|
|
|
| // This method is called after JSON file has been read. Method takes
|
| // ownership of the |value| pointer. Note, this method is used with
|
| @@ -63,24 +61,9 @@ class JsonPrefStore : public PersistentPrefStore,
|
| void OnFileRead(base::Value* value_owned, PrefReadError error, bool no_dir);
|
|
|
| private:
|
| - enum SetValueType {
|
| - // Indicates observers should be notified of the change.
|
| - SET_VALUE_NOTIFY,
|
| -
|
| - // Indicates observers should not be notified of the change.
|
| - SET_VALUE_DONT_NOTIFY
|
| - };
|
| -
|
| // ImportantFileWriter::DataSerializer overrides:
|
| virtual bool SerializeData(std::string* output);
|
|
|
| - // Implementation of SetValue.
|
| - void SetValueImpl(const std::string& key,
|
| - base::Value* value,
|
| - SetValueType type);
|
| -
|
| - static void ResetCheckIfValueDestroyed(base::Value* value);
|
| -
|
| FilePath path_;
|
| scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy_;
|
|
|
|
|