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

Unified Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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
Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index e80dfaff606a8e486597af4936ea6574be1eea35..8e12c9b059764877a62c0bb014c104e519ba6857 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -27,7 +27,7 @@ const char kKeyDisplayName[] = "displayName";
const char kKeyEmailAddress[] = "emailAddress";
const char kKeyEnterpriseDomain[] = "enterpriseDomain";
const char kKeyPublicAccount[] = "publicAccount";
-const char kKeyLocallyManagedUser[] = "locallyManagedUser";
+const char kKeySupervisedUser[] = "locallyManagedUser";
const char kKeySignedIn[] = "signedIn";
const char kKeyCanRemove[] = "canRemove";
const char kKeyIsOwner[] = "isOwner";
@@ -63,14 +63,14 @@ void UserSelectionScreen::FillUserDictionary(
const std::string& user_id = user->email();
const bool is_public_account =
user->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT;
- const bool is_locally_managed_user =
- user->GetType() == user_manager::USER_TYPE_LOCALLY_MANAGED;
+ const bool is_supervised_user =
+ user->GetType() == user_manager::USER_TYPE_SUPERVISED;
user_dict->SetString(kKeyUsername, user_id);
user_dict->SetString(kKeyEmailAddress, user->display_email());
user_dict->SetString(kKeyDisplayName, user->GetDisplayName());
user_dict->SetBoolean(kKeyPublicAccount, is_public_account);
- user_dict->SetBoolean(kKeyLocallyManagedUser, is_locally_managed_user);
+ user_dict->SetBoolean(kKeySupervisedUser, is_supervised_user);
user_dict->SetInteger(kKeyInitialAuthType, auth_type);
user_dict->SetBoolean(kKeySignedIn, user->is_logged_in());
user_dict->SetBoolean(kKeyIsOwner, is_owner);
@@ -114,12 +114,12 @@ bool UserSelectionScreen::ShouldForceOnlineSignIn(const User* user) {
return false;
const User::OAuthTokenStatus token_status = user->oauth_token_status();
- const bool is_locally_managed_user =
- user->GetType() == user_manager::USER_TYPE_LOCALLY_MANAGED;
+ const bool is_supervised_user =
+ user->GetType() == user_manager::USER_TYPE_SUPERVISED;
const bool is_public_session =
user->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT;
- if (is_locally_managed_user &&
+ if (is_supervised_user &&
token_status == User::OAUTH_TOKEN_STATUS_UNKNOWN) {
return false;
}
« no previous file with comments | « chrome/browser/chromeos/login/screens/screen_factory.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698