| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "components/sync_preferences/pref_service_syncable_factory.h" | 5 #include "components/sync_preferences/pref_service_syncable_factory.h" |
| 6 | 6 |
| 7 #include "base/trace_event/trace_event.h" | 7 #include "base/trace_event/trace_event.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "components/pref_registry/pref_registry_syncable.h" | 9 #include "components/pref_registry/pref_registry_syncable.h" |
| 10 #include "components/prefs/default_pref_store.h" | 10 #include "components/prefs/default_pref_store.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 auto supervised = | 90 auto supervised = |
| 91 CreateRegisteredPrefStore(registry.get(), supervised_user_prefs_, | 91 CreateRegisteredPrefStore(registry.get(), supervised_user_prefs_, |
| 92 PrefValueStore::SUPERVISED_USER_STORE); | 92 PrefValueStore::SUPERVISED_USER_STORE); |
| 93 auto extension = CreateRegisteredPrefStore(registry.get(), extension_prefs_, | 93 auto extension = CreateRegisteredPrefStore(registry.get(), extension_prefs_, |
| 94 PrefValueStore::EXTENSION_STORE); | 94 PrefValueStore::EXTENSION_STORE); |
| 95 auto command_line = CreateRegisteredPrefStore( | 95 auto command_line = CreateRegisteredPrefStore( |
| 96 registry.get(), command_line_prefs_, PrefValueStore::COMMAND_LINE_STORE); | 96 registry.get(), command_line_prefs_, PrefValueStore::COMMAND_LINE_STORE); |
| 97 auto recommended = CreateRegisteredPrefStore( | 97 auto recommended = CreateRegisteredPrefStore( |
| 98 registry.get(), recommended_prefs_, PrefValueStore::RECOMMENDED_STORE); | 98 registry.get(), recommended_prefs_, PrefValueStore::RECOMMENDED_STORE); |
| 99 | 99 |
| 100 // TODO(sammc): Register Mojo user pref store once implemented. |
| 100 std::unique_ptr<PrefServiceSyncable> pref_service(new PrefServiceSyncable( | 101 std::unique_ptr<PrefServiceSyncable> pref_service(new PrefServiceSyncable( |
| 101 pref_notifier, | 102 pref_notifier, |
| 102 new PrefValueStore(managed.get(), supervised.get(), extension.get(), | 103 new PrefValueStore(managed.get(), supervised.get(), extension.get(), |
| 103 command_line.get(), user_prefs_.get(), | 104 command_line.get(), user_prefs_.get(), |
| 104 recommended.get(), pref_registry->defaults().get(), | 105 recommended.get(), pref_registry->defaults().get(), |
| 105 pref_notifier), | 106 pref_notifier), |
| 106 user_prefs_.get(), pref_registry, pref_model_associator_client_, | 107 user_prefs_.get(), pref_registry, pref_model_associator_client_, |
| 107 read_error_callback_, async_)); | 108 read_error_callback_, async_)); |
| 108 return pref_service; | 109 return pref_service; |
| 109 } | 110 } |
| 110 | 111 |
| 111 } // namespace sync_preferences | 112 } // namespace sync_preferences |
| OLD | NEW |