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

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

Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 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/chrome_pref_service_factory.h
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.h b/chrome/browser/prefs/chrome_pref_service_factory.h
index 7c308ebfa56d2f78ccaacb86805a9fe4fb26411b..eb6b4fce2cc0a80a2f0b4e0dcc4a399e877135d6 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.h
+++ b/chrome/browser/prefs/chrome_pref_service_factory.h
@@ -16,15 +16,16 @@ namespace policy {
class PolicyService;
}
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
+class ManagedUserSettingsService;
class PrefRegistry;
class PrefService;
class PrefServiceSyncable;
class PrefStore;
-namespace user_prefs {
-class PrefRegistrySyncable;
-}
-
namespace chrome_prefs {
// Factory methods that create and initialize a new instance of a
@@ -46,7 +47,6 @@ PrefService* CreateLocalState(
const base::FilePath& pref_filename,
base::SequencedTaskRunner* pref_io_task_runner,
policy::PolicyService* policy_service,
- const scoped_refptr<PrefStore>& extension_prefs,
const scoped_refptr<PrefRegistry>& pref_registry,
bool async);
@@ -54,6 +54,7 @@ PrefServiceSyncable* CreateProfilePrefs(
const base::FilePath& pref_filename,
base::SequencedTaskRunner* pref_io_task_runner,
policy::PolicyService* policy_service,
+ ManagedUserSettingsService* managed_user_settings,
const scoped_refptr<PrefStore>& extension_prefs,
const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
bool async);

Powered by Google App Engine
This is Rietveld 408576698