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

Unified Diff: sync/internal_api/public/base/model_type.h

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 | « google_apis/gaia/gaia_constants.cc ('k') | sync/syncable/model_type.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/base/model_type.h
diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h
index c70d72aba6a7c01c65c9af5f80e4a49566042d15..91325267a3e955b16f2b11ff3544bfdaf73001f6 100644
--- a/sync/internal_api/public/base/model_type.h
+++ b/sync/internal_api/public/base/model_type.h
@@ -95,15 +95,15 @@ enum ModelType {
// These preferences are synced before other user types and are never
// encrypted.
PRIORITY_PREFERENCES,
- // Managed user settings.
- MANAGED_USER_SETTINGS,
- // Managed users. Every managed user is a profile that is configured remotely
- // by this user and can have restrictions applied. MANAGED_USERS and
- // MANAGED_USER_SETTINGS can not be encrypted.
- MANAGED_USERS,
- // Managed user shared settings. Shared settings can be modified both by the
- // manager and the supervised user.
- MANAGED_USER_SHARED_SETTINGS,
+ // Supervised user settings.
+ SUPERVISED_USER_SETTINGS,
+ // Supervised users. Every supervised user is a profile that is configured
+ // remotely by this user and can have restrictions applied. SUPERVISED_USERS
+ // and SUPERVISED_USER_SETTINGS can not be encrypted.
+ SUPERVISED_USERS,
+ // Supervised user shared settings. Shared settings can be modified both by
+ // the manager and the supervised user.
+ SUPERVISED_USER_SHARED_SETTINGS,
// Distilled articles.
ARTICLES,
// App List items
« no previous file with comments | « google_apis/gaia/gaia_constants.cc ('k') | sync/syncable/model_type.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698