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

Unified Diff: services/preferences/persistent_pref_store_factory.cc

Issue 2767743003: Pref service: Merge connectors and send a PrefRegistry in Connect(). (Closed)
Patch Set: Created 3 years, 9 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
Index: services/preferences/persistent_pref_store_factory.cc
diff --git a/services/preferences/persistent_pref_store_factory.cc b/services/preferences/persistent_pref_store_factory.cc
index c9909fbbe6942d6d2a07d05e7f0d1a192e63c21c..ef63057bcc19eb1569e14c1e73906d72d18ee0b2 100644
--- a/services/preferences/persistent_pref_store_factory.cc
+++ b/services/preferences/persistent_pref_store_factory.cc
@@ -16,23 +16,26 @@ namespace {
std::unique_ptr<PersistentPrefStoreImpl> CreateSimplePersistentPrefStore(
mojom::SimplePersistentPrefStoreConfigurationPtr config,
- base::SequencedWorkerPool* worker_pool) {
+ base::SequencedWorkerPool* worker_pool,
+ base::Closure on_initialized) {
return base::MakeUnique<PersistentPrefStoreImpl>(
new JsonPrefStore(config->pref_filename,
JsonPrefStore::GetTaskRunnerForFile(
config->pref_filename.DirName(), worker_pool),
nullptr),
- nullptr);
+ nullptr, std::move(on_initialized));
}
} // namespace
std::unique_ptr<PersistentPrefStoreImpl> CreatePersistentPrefStore(
mojom::PersistentPrefStoreConfigurationPtr configuration,
- base::SequencedWorkerPool* worker_pool) {
+ base::SequencedWorkerPool* worker_pool,
+ base::Closure on_initialized) {
if (configuration->is_simple_configuration()) {
return CreateSimplePersistentPrefStore(
- std::move(configuration->get_simple_configuration()), worker_pool);
+ std::move(configuration->get_simple_configuration()), worker_pool,
+ std::move(on_initialized));
}
NOTREACHED();
return nullptr;
« no previous file with comments | « services/preferences/persistent_pref_store_factory.h ('k') | services/preferences/persistent_pref_store_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698