Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: chrome/browser/prefs/pref_service_syncable_factory.h

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator
Patch Set: Move files back to //chrome/browser/prefs & //chrome/test/base Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
};

Powered by Google App Engine
This is Rietveld 408576698