| 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 "chrome/browser/prefs/pref_service_syncable_factory.h" | 5 #include "components/syncable_prefs/pref_service_syncable_factory.h" |
| 6 | 6 |
| 7 #include "base/prefs/default_pref_store.h" | 7 #include "base/prefs/default_pref_store.h" |
| 8 #include "base/prefs/pref_notifier_impl.h" | 8 #include "base/prefs/pref_notifier_impl.h" |
| 9 #include "base/prefs/pref_value_store.h" | 9 #include "base/prefs/pref_value_store.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| 11 #include "chrome/browser/prefs/pref_service_syncable.h" | |
| 12 #include "components/pref_registry/pref_registry_syncable.h" | 11 #include "components/pref_registry/pref_registry_syncable.h" |
| 12 #include "components/syncable_prefs/pref_service_syncable.h" |
| 13 | 13 |
| 14 #if defined(ENABLE_CONFIGURATION_POLICY) | 14 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 15 #include "components/policy/core/browser/browser_policy_connector.h" | 15 #include "components/policy/core/browser/browser_policy_connector.h" |
| 16 #include "components/policy/core/browser/configuration_policy_pref_store.h" | 16 #include "components/policy/core/browser/configuration_policy_pref_store.h" |
| 17 #include "components/policy/core/common/policy_service.h" | 17 #include "components/policy/core/common/policy_service.h" |
| 18 #include "components/policy/core/common/policy_types.h" | 18 #include "components/policy/core/common/policy_types.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 PrefServiceSyncableFactory::PrefServiceSyncableFactory() { | 21 PrefServiceSyncableFactory::PrefServiceSyncableFactory() { |
| 22 } | 22 } |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 recommended_prefs_.get(), | 60 recommended_prefs_.get(), |
| 61 pref_registry->defaults().get(), | 61 pref_registry->defaults().get(), |
| 62 pref_notifier), | 62 pref_notifier), |
| 63 user_prefs_.get(), | 63 user_prefs_.get(), |
| 64 pref_registry, | 64 pref_registry, |
| 65 pref_model_associator_client_, | 65 pref_model_associator_client_, |
| 66 read_error_callback_, | 66 read_error_callback_, |
| 67 async_)); | 67 async_)); |
| 68 return pref_service.Pass(); | 68 return pref_service.Pass(); |
| 69 } | 69 } |
| OLD | NEW |