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

Unified Diff: base/prefs/overlay_user_pref_store.h

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/overlay_user_pref_store.h
diff --git a/base/prefs/overlay_user_pref_store.h b/base/prefs/overlay_user_pref_store.h
index 04c309d8a10ac8caf90707def9b7f7bda904d61d..885da0813e7db431e7f5ff206cc0b970203eecef 100644
--- a/base/prefs/overlay_user_pref_store.h
+++ b/base/prefs/overlay_user_pref_store.h
@@ -51,6 +51,7 @@ class BASE_PREFS_EXPORT OverlayUserPrefStore : public PersistentPrefStore,
PrefReadError ReadPrefs() override;
void ReadPrefsAsync(ReadErrorDelegate* delegate) override;
void CommitPendingWrite() override;
+ void SchedulePendingLossyWrites() override;
void ReportValueChanged(const std::string& key, uint32 flags) override;
// Methods of PrefStore::Observer.
@@ -74,7 +75,7 @@ class BASE_PREFS_EXPORT OverlayUserPrefStore : public PersistentPrefStore,
// an in-memory PrefStore that is not persisted to disk.
bool ShallBeStoredInOverlay(const std::string& key) const;
- ObserverList<PrefStore::Observer, true> observers_;
+ base::ObserverList<PrefStore::Observer, true> observers_;
PrefValueMap overlay_;
scoped_refptr<PersistentPrefStore> underlay_;
NamesMap overlay_to_underlay_names_map_;
« 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