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

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

Issue 5174006: Move DeviceManagementPolicyProvider into the profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address feedback. Created 10 years, 1 month 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_value_store.cc
diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc
index 537aa6adbb466abb0f9c2b97339ab9b39a6fbad4..81cb2b1ed0e3152f56650c5791e1a89b265be827 100644
--- a/chrome/browser/prefs/pref_value_store.cc
+++ b/chrome/browser/prefs/pref_value_store.cc
@@ -54,14 +54,16 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore(
managed =
ConfigurationPolicyPrefStore::CreateManagedPlatformPolicyPrefStore();
device_management =
- ConfigurationPolicyPrefStore::CreateDeviceManagementPolicyPrefStore();
+ ConfigurationPolicyPrefStore::CreateDeviceManagementPolicyPrefStore(
+ profile);
extension = new ExtensionPrefStore(profile, PrefNotifier::EXTENSION_STORE);
command_line = new CommandLinePrefStore(CommandLine::ForCurrentProcess());
recommended =
ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore();
}
return new PrefValueStore(managed, device_management, extension,
- command_line, user, recommended, default_store);
+ command_line, user, recommended, default_store,
+ profile);
}
PrefValueStore::~PrefValueStore() {}
@@ -428,7 +430,8 @@ void PrefValueStore::RefreshPolicyPrefs(
PrefStore* new_managed_platform_pref_store(
ConfigurationPolicyPrefStore::CreateManagedPlatformPolicyPrefStore());
PrefStore* new_device_management_pref_store(
- ConfigurationPolicyPrefStore::CreateDeviceManagementPolicyPrefStore());
+ ConfigurationPolicyPrefStore::CreateDeviceManagementPolicyPrefStore(
+ profile_));
PrefStore* new_recommended_pref_store(
ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore());
BrowserThread::ID current_thread_id;
@@ -466,7 +469,9 @@ PrefValueStore::PrefValueStore(PrefStore* managed_platform_prefs,
PrefStore* command_line_prefs,
PrefStore* user_prefs,
PrefStore* recommended_prefs,
- PrefStore* default_prefs) {
+ PrefStore* default_prefs,
+ Profile* profile)
+ : profile_(profile) {
// NULL default pref store is usually bad, but may be OK for some unit tests.
if (!default_prefs)
LOG(WARNING) << "default pref store is null";

Powered by Google App Engine
This is Rietveld 408576698