| Index: chrome/browser/prefs/pref_service_syncable_factory.h
|
| diff --git a/chrome/browser/prefs/pref_service_syncable_factory.h b/chrome/browser/prefs/pref_service_syncable_factory.h
|
| index ff57059a5ecbb10293be25dadbf8c2f33ea47d9a..da75ddb730e76be7af863a76d219488bdec6091b 100644
|
| --- a/chrome/browser/prefs/pref_service_syncable_factory.h
|
| +++ b/chrome/browser/prefs/pref_service_syncable_factory.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/prefs/pref_service_factory.h"
|
|
|
| +class PrefModelAssociatorClient;
|
| class PrefServiceSyncable;
|
|
|
| namespace base {
|
| @@ -14,6 +15,7 @@ class CommandLine;
|
| }
|
|
|
| namespace policy {
|
| +class BrowserPolicyConnector;
|
| class PolicyService;
|
| }
|
|
|
| @@ -30,18 +32,23 @@ class PrefServiceSyncableFactory : public base::PrefServiceFactory {
|
| ~PrefServiceSyncableFactory() override;
|
|
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| - // Set up policy pref stores using the given policy service.
|
| - void SetManagedPolicies(policy::PolicyService* service);
|
| - void SetRecommendedPolicies(policy::PolicyService* service);
|
| + // Set up policy pref stores using the given policy service and connector.
|
| + void SetManagedPolicies(policy::PolicyService* service,
|
| + policy::BrowserPolicyConnector* connector);
|
| + void SetRecommendedPolicies(policy::PolicyService* service,
|
| + policy::BrowserPolicyConnector* connector);
|
| #endif
|
|
|
| - // Specifies to use an actual command-line backed command-line pref store.
|
| - void SetCommandLine(base::CommandLine* command_line);
|
| + // Specifies the PrefModelAssociatorClient to use.
|
| + void SetPrefModelAssociatorClient(
|
| + PrefModelAssociatorClient* pref_model_associator_client);
|
|
|
| scoped_ptr<PrefServiceSyncable> CreateSyncable(
|
| user_prefs::PrefRegistrySyncable* registry);
|
|
|
| private:
|
| + PrefModelAssociatorClient* pref_model_associator_client_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncableFactory);
|
| };
|
|
|
|
|