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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2791903003: Pref service: have Mash and Chrome connect to the right pref stores (Closed)
Patch Set: ProfilePrefStoreManagerTest: explicit list stores to connect to Created 3 years, 8 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 | « chrome/browser/prefs/browser_prefs.h ('k') | chrome/browser/prefs/profile_pref_store_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 74a53a48d5af7fac46d691fb4fb67ab7df13e5c3..902042210ea2701c083152aaa034f88b1cad6490 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -793,4 +793,25 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
}
}
+std::set<PrefValueStore::PrefStoreType> ExpectedPrefStores() {
+ return std::set<PrefValueStore::PrefStoreType>({
+ PrefValueStore::MANAGED_STORE,
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+ PrefValueStore::SUPERVISED_USER_STORE,
+#endif
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+ PrefValueStore::EXTENSION_STORE,
+#endif
+ PrefValueStore::COMMAND_LINE_STORE, PrefValueStore::RECOMMENDED_STORE,
+ PrefValueStore::USER_STORE, PrefValueStore::DEFAULT_STORE
+ });
+}
+
+std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() {
+ auto pref_stores = ExpectedPrefStores();
+ pref_stores.erase(PrefValueStore::DEFAULT_STORE);
+ pref_stores.erase(PrefValueStore::USER_STORE);
+ return pref_stores;
+}
+
} // namespace chrome
« no previous file with comments | « chrome/browser/prefs/browser_prefs.h ('k') | chrome/browser/prefs/profile_pref_store_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698