| Index: chrome/browser/prefs/incognito_user_pref_store.h
|
| diff --git a/chrome/browser/prefs/incognito_user_pref_store.h b/chrome/browser/prefs/incognito_user_pref_store.h
|
| index b5be17eb7c66b728feb9a24615738884c9bc1da0..f1cdfc80c78d1841761625c4ed908bffa3a24470 100644
|
| --- a/chrome/browser/prefs/incognito_user_pref_store.h
|
| +++ b/chrome/browser/prefs/incognito_user_pref_store.h
|
| @@ -9,6 +9,7 @@
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/observer_list.h"
|
| #include "chrome/browser/prefs/pref_value_map.h"
|
| @@ -27,39 +28,38 @@ class IncognitoUserPrefStore : public PersistentPrefStore,
|
| // Returns true if a value has been set for the |key| in this
|
| // IncognitoUserPrefStore, i.e. if it potentially overrides a value
|
| // from the |underlay_|.
|
| - virtual bool IsSetInOverlay(const std::string& key) const;
|
| + 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 void CommitPendingWrite() OVERRIDE;
|
| + virtual void ReportValueChanged(const std::string& key) OVERRIDE;
|
|
|
| private:
|
| // 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;
|
|
|
| // Returns true if |key| corresponds to a preference that shall be stored in
|
| // an in-memory PrefStore that is not persisted to disk. All preferences
|
| // that store information about the browsing history or behavior of the user
|
| // should have this property.
|
| - virtual bool ShallBeStoredInOverlay(const std::string& key) const;
|
| + bool ShallBeStoredInOverlay(const std::string& key) const;
|
|
|
| ObserverList<PrefStore::Observer, true> observers_;
|
| PrefValueMap overlay_;
|
|
|