Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: base/prefs/overlay_user_pref_store.h

Issue 614103004: replace 'virtual ... OVERRIDE' with '... override' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: process base/ 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ 5 #ifndef BASE_PREFS_OVERLAY_USER_PREF_STORE_H_
6 #define BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ 6 #define BASE_PREFS_OVERLAY_USER_PREF_STORE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 12 matching lines...) Expand all
23 public PrefStore::Observer { 23 public PrefStore::Observer {
24 public: 24 public:
25 explicit OverlayUserPrefStore(PersistentPrefStore* underlay); 25 explicit OverlayUserPrefStore(PersistentPrefStore* underlay);
26 26
27 // Returns true if a value has been set for the |key| in this 27 // Returns true if a value has been set for the |key| in this
28 // OverlayUserPrefStore, i.e. if it potentially overrides a value 28 // OverlayUserPrefStore, i.e. if it potentially overrides a value
29 // from the |underlay_|. 29 // from the |underlay_|.
30 virtual bool IsSetInOverlay(const std::string& key) const; 30 virtual bool IsSetInOverlay(const std::string& key) const;
31 31
32 // Methods of PrefStore. 32 // Methods of PrefStore.
33 virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE; 33 void AddObserver(PrefStore::Observer* observer) override;
34 virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE; 34 void RemoveObserver(PrefStore::Observer* observer) override;
35 virtual bool HasObservers() const OVERRIDE; 35 bool HasObservers() const override;
36 virtual bool IsInitializationComplete() const OVERRIDE; 36 bool IsInitializationComplete() const override;
37 virtual bool GetValue(const std::string& key, 37 bool GetValue(const std::string& key,
38 const base::Value** result) const OVERRIDE; 38 const base::Value** result) const override;
39 39
40 // Methods of PersistentPrefStore. 40 // Methods of PersistentPrefStore.
41 virtual bool GetMutableValue(const std::string& key, 41 bool GetMutableValue(const std::string& key, base::Value** result) override;
42 base::Value** result) OVERRIDE; 42 void SetValue(const std::string& key, base::Value* value) override;
43 virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE; 43 void SetValueSilently(const std::string& key, base::Value* value) override;
44 virtual void SetValueSilently(const std::string& key, 44 void RemoveValue(const std::string& key) override;
45 base::Value* value) OVERRIDE; 45 bool ReadOnly() const override;
46 virtual void RemoveValue(const std::string& key) OVERRIDE; 46 PrefReadError GetReadError() const override;
47 virtual bool ReadOnly() const OVERRIDE; 47 PrefReadError ReadPrefs() override;
48 virtual PrefReadError GetReadError() const OVERRIDE; 48 void ReadPrefsAsync(ReadErrorDelegate* delegate) override;
49 virtual PrefReadError ReadPrefs() OVERRIDE; 49 void CommitPendingWrite() override;
50 virtual void ReadPrefsAsync(ReadErrorDelegate* delegate) OVERRIDE; 50 void ReportValueChanged(const std::string& key) override;
51 virtual void CommitPendingWrite() OVERRIDE;
52 virtual void ReportValueChanged(const std::string& key) OVERRIDE;
53 51
54 // Methods of PrefStore::Observer. 52 // Methods of PrefStore::Observer.
55 virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; 53 void OnPrefValueChanged(const std::string& key) override;
56 virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; 54 void OnInitializationCompleted(bool succeeded) override;
57 55
58 void RegisterOverlayPref(const std::string& key); 56 void RegisterOverlayPref(const std::string& key);
59 void RegisterOverlayPref(const std::string& overlay_key, 57 void RegisterOverlayPref(const std::string& overlay_key,
60 const std::string& underlay_key); 58 const std::string& underlay_key);
61 59
62 protected: 60 protected:
63 virtual ~OverlayUserPrefStore(); 61 virtual ~OverlayUserPrefStore();
64 62
65 private: 63 private:
66 typedef std::map<std::string, std::string> NamesMap; 64 typedef std::map<std::string, std::string> NamesMap;
67 65
68 const std::string& GetOverlayKey(const std::string& underlay_key) const; 66 const std::string& GetOverlayKey(const std::string& underlay_key) const;
69 const std::string& GetUnderlayKey(const std::string& overlay_key) const; 67 const std::string& GetUnderlayKey(const std::string& overlay_key) const;
70 68
71 // Returns true if |key| corresponds to a preference that shall be stored in 69 // Returns true if |key| corresponds to a preference that shall be stored in
72 // an in-memory PrefStore that is not persisted to disk. 70 // an in-memory PrefStore that is not persisted to disk.
73 bool ShallBeStoredInOverlay(const std::string& key) const; 71 bool ShallBeStoredInOverlay(const std::string& key) const;
74 72
75 ObserverList<PrefStore::Observer, true> observers_; 73 ObserverList<PrefStore::Observer, true> observers_;
76 PrefValueMap overlay_; 74 PrefValueMap overlay_;
77 scoped_refptr<PersistentPrefStore> underlay_; 75 scoped_refptr<PersistentPrefStore> underlay_;
78 NamesMap overlay_to_underlay_names_map_; 76 NamesMap overlay_to_underlay_names_map_;
79 NamesMap underlay_to_overlay_names_map_; 77 NamesMap underlay_to_overlay_names_map_;
80 78
81 DISALLOW_COPY_AND_ASSIGN(OverlayUserPrefStore); 79 DISALLOW_COPY_AND_ASSIGN(OverlayUserPrefStore);
82 }; 80 };
83 81
84 #endif // BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ 82 #endif // BASE_PREFS_OVERLAY_USER_PREF_STORE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698