| 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" |
| 11 #include "components/prefs/pref_notifier_impl.h" | 11 #include "components/prefs/pref_notifier_impl.h" |
| 12 #include "components/prefs/pref_value_store.h" | 12 #include "components/prefs/pref_value_store.h" |
| 13 #include "components/sync_preferences/pref_service_syncable.h" | 13 #include "components/sync_preferences/pref_service_syncable.h" |
| 14 #include "services/preferences/public/cpp/pref_store_adapter.h" |
| 15 #include "services/preferences/public/interfaces/preferences.mojom.h" |
| 16 #include "services/service_manager/public/cpp/connector.h" |
| 14 | 17 |
| 15 #if !defined(OS_IOS) | 18 #if !defined(OS_IOS) |
| 16 #include "components/policy/core/browser/browser_policy_connector.h" | 19 #include "components/policy/core/browser/browser_policy_connector.h" |
| 17 #include "components/policy/core/browser/configuration_policy_pref_store.h" | 20 #include "components/policy/core/browser/configuration_policy_pref_store.h" |
| 18 #include "components/policy/core/common/policy_service.h" // nogncheck | 21 #include "components/policy/core/common/policy_service.h" // nogncheck |
| 19 #include "components/policy/core/common/policy_types.h" // nogncheck | 22 #include "components/policy/core/common/policy_types.h" // nogncheck |
| 20 #endif | 23 #endif |
| 21 | 24 |
| 22 namespace sync_preferences { | 25 namespace sync_preferences { |
| 23 | 26 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 45 #else | 48 #else |
| 46 NOTREACHED(); | 49 NOTREACHED(); |
| 47 #endif | 50 #endif |
| 48 } | 51 } |
| 49 | 52 |
| 50 void PrefServiceSyncableFactory::SetPrefModelAssociatorClient( | 53 void PrefServiceSyncableFactory::SetPrefModelAssociatorClient( |
| 51 PrefModelAssociatorClient* pref_model_associator_client) { | 54 PrefModelAssociatorClient* pref_model_associator_client) { |
| 52 pref_model_associator_client_ = pref_model_associator_client; | 55 pref_model_associator_client_ = pref_model_associator_client; |
| 53 } | 56 } |
| 54 | 57 |
| 58 namespace { |
| 59 |
| 60 scoped_refptr<::PrefStore> CreateRegisteredPrefStore( |
| 61 service_manager::Connector* connector, |
| 62 scoped_refptr<::PrefStore> backing_pref_store, |
| 63 PrefValueStore::PrefStoreType type) { |
| 64 prefs::mojom::PrefStoreRegistryPtr registry_ptr; |
| 65 connector->BindInterface(prefs::mojom::kPrefStoreServiceName, ®istry_ptr); |
| 66 CHECK(!registry_ptr.encountered_error()); |
| 67 registry_ptr.set_connection_error_handler(base::Bind([]() { |
| 68 LOG(INFO) << "registry_ptr connection error!"; |
| 69 })); |
| 70 return make_scoped_refptr(new prefs::PrefStoreAdapter( |
| 71 backing_pref_store, |
| 72 prefs::PrefStoreImpl::Create(std::move(registry_ptr), backing_pref_store, |
| 73 type))); |
| 74 } |
| 75 |
| 76 } // namespace |
| 77 |
| 55 std::unique_ptr<PrefServiceSyncable> PrefServiceSyncableFactory::CreateSyncable( | 78 std::unique_ptr<PrefServiceSyncable> PrefServiceSyncableFactory::CreateSyncable( |
| 56 user_prefs::PrefRegistrySyncable* pref_registry) { | 79 user_prefs::PrefRegistrySyncable* pref_registry, |
| 80 service_manager::Connector* connector) { |
| 57 TRACE_EVENT0("browser", "PrefServiceSyncableFactory::CreateSyncable"); | 81 TRACE_EVENT0("browser", "PrefServiceSyncableFactory::CreateSyncable"); |
| 58 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); | 82 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); |
| 83 |
| 84 auto managed = CreateRegisteredPrefStore(connector, managed_prefs_.get(), |
| 85 PrefValueStore::MANAGED_STORE); |
| 86 // auto extension = CreateRegisteredPrefStore(connector, extension_prefs_.get(
), |
| 87 // PrefValueStore::EXTENSION_STORE)
; |
| 59 std::unique_ptr<PrefServiceSyncable> pref_service(new PrefServiceSyncable( | 88 std::unique_ptr<PrefServiceSyncable> pref_service(new PrefServiceSyncable( |
| 60 pref_notifier, | 89 pref_notifier, |
| 61 new PrefValueStore(managed_prefs_.get(), supervised_user_prefs_.get(), | 90 new PrefValueStore(managed.get(), supervised_user_prefs_.get(), |
| 62 extension_prefs_.get(), command_line_prefs_.get(), | 91 extension_prefs_.get(), command_line_prefs_.get(), |
| 63 user_prefs_.get(), recommended_prefs_.get(), | 92 user_prefs_.get(), recommended_prefs_.get(), |
| 64 pref_registry->defaults().get(), pref_notifier), | 93 pref_registry->defaults().get(), pref_notifier), |
| 65 user_prefs_.get(), pref_registry, pref_model_associator_client_, | 94 user_prefs_.get(), pref_registry, pref_model_associator_client_, |
| 66 read_error_callback_, async_)); | 95 read_error_callback_, async_)); |
| 67 return pref_service; | 96 return pref_service; |
| 68 } | 97 } |
| 69 | 98 |
| 70 } // namespace sync_preferences | 99 } // namespace sync_preferences |
| OLD | NEW |