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

Unified Diff: base/prefs/pref_value_store.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_value_store.h ('k') | base/prefs/pref_value_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/pref_value_store.cc
diff --git a/base/prefs/pref_value_store.cc b/base/prefs/pref_value_store.cc
index 1095abbbc5a92f391b05a4cf1d69a358c892fe3e..2c22f17febebdd15aa8590778af7bcbce4a6a6e8 100644
--- a/base/prefs/pref_value_store.cc
+++ b/base/prefs/pref_value_store.cc
@@ -47,7 +47,7 @@ void PrefValueStore::PrefStoreKeeper::OnInitializationCompleted(
}
PrefValueStore::PrefValueStore(PrefStore* managed_prefs,
- PrefStore* managed_user_prefs,
+ PrefStore* supervised_user_prefs,
PrefStore* extension_prefs,
PrefStore* command_line_prefs,
PrefStore* user_prefs,
@@ -57,7 +57,7 @@ PrefValueStore::PrefValueStore(PrefStore* managed_prefs,
: pref_notifier_(pref_notifier),
initialization_failed_(false) {
InitPrefStore(MANAGED_STORE, managed_prefs);
- InitPrefStore(MANAGED_USER_STORE, managed_user_prefs);
+ InitPrefStore(SUPERVISED_USER_STORE, supervised_user_prefs);
InitPrefStore(EXTENSION_STORE, extension_prefs);
InitPrefStore(COMMAND_LINE_STORE, command_line_prefs);
InitPrefStore(USER_STORE, user_prefs);
@@ -71,7 +71,7 @@ PrefValueStore::~PrefValueStore() {}
PrefValueStore* PrefValueStore::CloneAndSpecialize(
PrefStore* managed_prefs,
- PrefStore* managed_user_prefs,
+ PrefStore* supervised_user_prefs,
PrefStore* extension_prefs,
PrefStore* command_line_prefs,
PrefStore* user_prefs,
@@ -81,8 +81,8 @@ PrefValueStore* PrefValueStore::CloneAndSpecialize(
DCHECK(pref_notifier);
if (!managed_prefs)
managed_prefs = GetPrefStore(MANAGED_STORE);
- if (!managed_user_prefs)
- managed_user_prefs = GetPrefStore(MANAGED_USER_STORE);
+ if (!supervised_user_prefs)
+ supervised_user_prefs = GetPrefStore(SUPERVISED_USER_STORE);
if (!extension_prefs)
extension_prefs = GetPrefStore(EXTENSION_STORE);
if (!command_line_prefs)
@@ -95,7 +95,7 @@ PrefValueStore* PrefValueStore::CloneAndSpecialize(
default_prefs = GetPrefStore(DEFAULT_STORE);
return new PrefValueStore(
- managed_prefs, managed_user_prefs, extension_prefs, command_line_prefs,
+ managed_prefs, supervised_user_prefs, extension_prefs, command_line_prefs,
user_prefs, recommended_prefs, default_prefs, pref_notifier);
}
« no previous file with comments | « base/prefs/pref_value_store.h ('k') | base/prefs/pref_value_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698