| 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 #ifndef COMPONENTS_SYNC_PREFERENCES_PREF_SERVICE_SYNCABLE_FACTORY_H_ | 5 #ifndef COMPONENTS_SYNC_PREFERENCES_PREF_SERVICE_SYNCABLE_FACTORY_H_ |
| 6 #define COMPONENTS_SYNC_PREFERENCES_PREF_SERVICE_SYNCABLE_FACTORY_H_ | 6 #define COMPONENTS_SYNC_PREFERENCES_PREF_SERVICE_SYNCABLE_FACTORY_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> |
| 9 | 10 |
| 10 #include "base/macros.h" | 11 #include "base/macros.h" |
| 11 #include "components/prefs/pref_service_factory.h" | 12 #include "components/prefs/pref_service_factory.h" |
| 13 #include "components/prefs/pref_value_store.h" |
| 12 | 14 |
| 13 namespace policy { | 15 namespace policy { |
| 14 class BrowserPolicyConnector; | 16 class BrowserPolicyConnector; |
| 15 class PolicyService; | 17 class PolicyService; |
| 16 } | 18 } |
| 17 | 19 |
| 18 namespace service_manager { | 20 namespace service_manager { |
| 19 class Connector; | 21 class Connector; |
| 20 } | 22 } |
| 21 | 23 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 45 | 47 |
| 46 void SetPrefModelAssociatorClient( | 48 void SetPrefModelAssociatorClient( |
| 47 PrefModelAssociatorClient* pref_model_associator_client); | 49 PrefModelAssociatorClient* pref_model_associator_client); |
| 48 | 50 |
| 49 // |connector| might be null during test or if we're not using the Mojo pref | 51 // |connector| might be null during test or if we're not using the Mojo pref |
| 50 // |service. | 52 // |service. |
| 51 std::unique_ptr<PrefServiceSyncable> CreateSyncable( | 53 std::unique_ptr<PrefServiceSyncable> CreateSyncable( |
| 52 user_prefs::PrefRegistrySyncable* registry, | 54 user_prefs::PrefRegistrySyncable* registry, |
| 53 service_manager::Connector* connector = nullptr); | 55 service_manager::Connector* connector = nullptr); |
| 54 | 56 |
| 57 std::unique_ptr<PrefServiceSyncable> CreateIncognitoSyncable( |
| 58 user_prefs::PrefRegistrySyncable* pref_registry, |
| 59 PrefStore* incognito_extension_pref_store, |
| 60 const std::vector<const char*>& overlay_pref_names, |
| 61 std::set<PrefValueStore::PrefStoreType> already_connected_types, |
| 62 service_manager::Connector* incognito_connector, |
| 63 service_manager::Connector* user_connector); |
| 64 |
| 55 private: | 65 private: |
| 56 PrefModelAssociatorClient* pref_model_associator_client_; | 66 PrefModelAssociatorClient* pref_model_associator_client_; |
| 57 | 67 |
| 58 DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncableFactory); | 68 DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncableFactory); |
| 59 }; | 69 }; |
| 60 | 70 |
| 61 } // namespace sync_preferences | 71 } // namespace sync_preferences |
| 62 | 72 |
| 63 #endif // COMPONENTS_SYNC_PREFERENCES_PREF_SERVICE_SYNCABLE_FACTORY_H_ | 73 #endif // COMPONENTS_SYNC_PREFERENCES_PREF_SERVICE_SYNCABLE_FACTORY_H_ |
| OLD | NEW |