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

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

Issue 1141793003: Update from https://crrev.com/329939 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « base/prefs/json_pref_store_unittest.cc ('k') | base/prefs/overlay_user_pref_store.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 21 matching lines...) Expand all
32 // Methods of PrefStore. 32 // Methods of PrefStore.
33 void AddObserver(PrefStore::Observer* observer) override; 33 void AddObserver(PrefStore::Observer* observer) override;
34 void RemoveObserver(PrefStore::Observer* observer) override; 34 void RemoveObserver(PrefStore::Observer* observer) override;
35 bool HasObservers() const override; 35 bool HasObservers() const override;
36 bool IsInitializationComplete() const override; 36 bool IsInitializationComplete() const override;
37 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 bool GetMutableValue(const std::string& key, base::Value** result) override; 41 bool GetMutableValue(const std::string& key, base::Value** result) override;
42 void SetValue(const std::string& key, base::Value* value) override; 42 void SetValue(const std::string& key,
43 void SetValueSilently(const std::string& key, base::Value* value) override; 43 base::Value* value,
44 void RemoveValue(const std::string& key) override; 44 uint32 flags) override;
45 void SetValueSilently(const std::string& key,
46 base::Value* value,
47 uint32 flags) override;
48 void RemoveValue(const std::string& key, uint32 flags) override;
45 bool ReadOnly() const override; 49 bool ReadOnly() const override;
46 PrefReadError GetReadError() const override; 50 PrefReadError GetReadError() const override;
47 PrefReadError ReadPrefs() override; 51 PrefReadError ReadPrefs() override;
48 void ReadPrefsAsync(ReadErrorDelegate* delegate) override; 52 void ReadPrefsAsync(ReadErrorDelegate* delegate) override;
49 void CommitPendingWrite() override; 53 void CommitPendingWrite() override;
50 void ReportValueChanged(const std::string& key) override; 54 void ReportValueChanged(const std::string& key, uint32 flags) override;
51 55
52 // Methods of PrefStore::Observer. 56 // Methods of PrefStore::Observer.
53 void OnPrefValueChanged(const std::string& key) override; 57 void OnPrefValueChanged(const std::string& key) override;
54 void OnInitializationCompleted(bool succeeded) override; 58 void OnInitializationCompleted(bool succeeded) override;
55 59
56 void RegisterOverlayPref(const std::string& key); 60 void RegisterOverlayPref(const std::string& key);
57 void RegisterOverlayPref(const std::string& overlay_key, 61 void RegisterOverlayPref(const std::string& overlay_key,
58 const std::string& underlay_key); 62 const std::string& underlay_key);
59 63
60 protected: 64 protected:
(...skipping 12 matching lines...) Expand all
73 ObserverList<PrefStore::Observer, true> observers_; 77 ObserverList<PrefStore::Observer, true> observers_;
74 PrefValueMap overlay_; 78 PrefValueMap overlay_;
75 scoped_refptr<PersistentPrefStore> underlay_; 79 scoped_refptr<PersistentPrefStore> underlay_;
76 NamesMap overlay_to_underlay_names_map_; 80 NamesMap overlay_to_underlay_names_map_;
77 NamesMap underlay_to_overlay_names_map_; 81 NamesMap underlay_to_overlay_names_map_;
78 82
79 DISALLOW_COPY_AND_ASSIGN(OverlayUserPrefStore); 83 DISALLOW_COPY_AND_ASSIGN(OverlayUserPrefStore);
80 }; 84 };
81 85
82 #endif // BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ 86 #endif // BASE_PREFS_OVERLAY_USER_PREF_STORE_H_
OLDNEW
« no previous file with comments | « base/prefs/json_pref_store_unittest.cc ('k') | base/prefs/overlay_user_pref_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698