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

Unified Diff: components/sync_driver/model_association_manager.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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/test/base/testing_profile_manager.cc ('k') | components/sync_driver/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_driver/model_association_manager.cc
diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc
index a66372f7f3aab1ba8c0987b752631f1addd4a88f..57a8a28a9ba37bca2b946a538b4813d5fe06363e 100644
--- a/components/sync_driver/model_association_manager.cc
+++ b/components/sync_driver/model_association_manager.cc
@@ -39,9 +39,9 @@ static const syncer::ModelType kStartOrder[] = {
// UI thread data types.
syncer::BOOKMARKS,
- syncer::MANAGED_USERS, // Syncing managed users on initial login might
- // block creating a new managed user, so we
- // want to do it early.
+ syncer::SUPERVISED_USERS, // Syncing supervised users on initial login
+ // might block creating a new supervised user,
+ // so we want to do it early.
syncer::PREFERENCES,
syncer::PRIORITY_PREFERENCES,
syncer::EXTENSIONS,
@@ -54,8 +54,8 @@ static const syncer::ModelType kStartOrder[] = {
syncer::DICTIONARY,
syncer::FAVICON_IMAGES,
syncer::FAVICON_TRACKING,
- syncer::MANAGED_USER_SETTINGS,
- syncer::MANAGED_USER_SHARED_SETTINGS,
+ syncer::SUPERVISED_USER_SETTINGS,
+ syncer::SUPERVISED_USER_SHARED_SETTINGS,
syncer::ARTICLES,
};
« no previous file with comments | « chrome/test/base/testing_profile_manager.cc ('k') | components/sync_driver/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698