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

Unified Diff: base/prefs/pref_service_builder.cc

Issue 23610004: Rename managed user pref store to supervised user pref store. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 4 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 | « base/prefs/pref_service_builder.h ('k') | base/prefs/pref_value_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/pref_service_builder.cc
diff --git a/base/prefs/pref_service_builder.cc b/base/prefs/pref_service_builder.cc
index b79abddf8e09f36890ca3043022c0c414f5ee50d..16b4565663b4ce67a7239d03d191b1d0b68e66bb 100644
--- a/base/prefs/pref_service_builder.cc
+++ b/base/prefs/pref_service_builder.cc
@@ -32,8 +32,9 @@ PrefServiceBuilder& PrefServiceBuilder::WithManagedPrefs(PrefStore* store) {
return *this;
}
-PrefServiceBuilder& PrefServiceBuilder::WithManagedUserPrefs(PrefStore* store) {
- managed_user_prefs_ = store;
+PrefServiceBuilder& PrefServiceBuilder::WithSupervisedUserPrefs(
+ PrefStore* store) {
+ supervised_user_prefs_ = store;
return *this;
}
@@ -82,7 +83,7 @@ PrefService* PrefServiceBuilder::Create(PrefRegistry* pref_registry) {
PrefService* pref_service =
new PrefService(pref_notifier,
new PrefValueStore(managed_prefs_.get(),
- managed_user_prefs_.get(),
+ supervised_user_prefs_.get(),
extension_prefs_.get(),
command_line_prefs_.get(),
user_prefs_.get(),
@@ -99,7 +100,7 @@ PrefService* PrefServiceBuilder::Create(PrefRegistry* pref_registry) {
void PrefServiceBuilder::ResetDefaultState() {
managed_prefs_ = NULL;
- managed_user_prefs_ = NULL;
+ supervised_user_prefs_ = NULL;
extension_prefs_ = NULL;
command_line_prefs_ = NULL;
user_prefs_ = NULL;
« no previous file with comments | « base/prefs/pref_service_builder.h ('k') | base/prefs/pref_value_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698