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

Unified Diff: chrome/browser/prefs/pref_service.cc

Issue 6979011: Move user cloud policy to BrowserProcess. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments by mnissler. Created 9 years, 6 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
« no previous file with comments | « chrome/browser/prefs/pref_service.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_service.cc
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index 618f6eae8147ce689e3dab114ec4d29d9e810a1e..abcdd829abeaf6e1237888444bc0a06860fa8755 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -112,7 +112,6 @@ class ReadErrorHandler : public PersistentPrefStore::ReadErrorDelegate {
// static
PrefService* PrefService::CreatePrefService(const FilePath& pref_filename,
PrefStore* extension_prefs,
- Profile* profile,
bool async) {
using policy::ConfigurationPolicyPrefStore;
@@ -132,7 +131,7 @@ PrefService* PrefService::CreatePrefService(const FilePath& pref_filename,
ConfigurationPolicyPrefStore* managed_platform =
ConfigurationPolicyPrefStore::CreateManagedPlatformPolicyPrefStore();
ConfigurationPolicyPrefStore* managed_cloud =
- ConfigurationPolicyPrefStore::CreateManagedCloudPolicyPrefStore(profile);
+ ConfigurationPolicyPrefStore::CreateManagedCloudPolicyPrefStore();
CommandLinePrefStore* command_line =
new CommandLinePrefStore(CommandLine::ForCurrentProcess());
JsonPrefStore* user = new JsonPrefStore(
@@ -141,8 +140,7 @@ PrefService* PrefService::CreatePrefService(const FilePath& pref_filename,
ConfigurationPolicyPrefStore* recommended_platform =
ConfigurationPolicyPrefStore::CreateRecommendedPlatformPolicyPrefStore();
ConfigurationPolicyPrefStore* recommended_cloud =
- ConfigurationPolicyPrefStore::CreateRecommendedCloudPolicyPrefStore(
- profile);
+ ConfigurationPolicyPrefStore::CreateRecommendedCloudPolicyPrefStore();
DefaultPrefStore* default_pref_store = new DefaultPrefStore();
return new PrefService(
« no previous file with comments | « chrome/browser/prefs/pref_service.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698