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

Unified Diff: chrome/browser/chromeos/login/auth/parallel_authenticator.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/auth/parallel_authenticator.cc
diff --git a/chrome/browser/chromeos/login/auth/parallel_authenticator.cc b/chrome/browser/chromeos/login/auth/parallel_authenticator.cc
index 96e3f231220cc5d038ebd6213a4a9b82fa718dd7..1f3d3754c34eefb99e51eb3d5534958c3441b989 100644
--- a/chrome/browser/chromeos/login/auth/parallel_authenticator.cc
+++ b/chrome/browser/chromeos/login/auth/parallel_authenticator.cc
@@ -300,13 +300,13 @@ void ParallelAuthenticator::AuthenticateToUnlock(
scoped_refptr<ParallelAuthenticator>(this)));
}
-void ParallelAuthenticator::LoginAsLocallyManagedUser(
+void ParallelAuthenticator::LoginAsSupervisedUser(
const UserContext& user_context) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// TODO(nkostylev): Pass proper value for |user_is_new| or remove (not used).
current_state_.reset(
new AuthAttemptState(user_context,
- user_manager::USER_TYPE_LOCALLY_MANAGED,
+ user_manager::USER_TYPE_SUPERVISED,
false, // unlock
false, // online_complete
false)); // user_is_new
@@ -655,7 +655,7 @@ void ParallelAuthenticator::Resolve() {
FROM_HERE,
base::Bind(&ParallelAuthenticator::OnAuthSuccess, this));
break;
- case LOCALLY_MANAGED_USER_LOGIN:
+ case SUPERVISED_USER_LOGIN:
current_state_->user_context.SetIsUsingOAuth(false);
BrowserThread::PostTask(
BrowserThread::UI,
@@ -800,8 +800,8 @@ ParallelAuthenticator::ResolveCryptohomeSuccessState() {
return PUBLIC_ACCOUNT_LOGIN;
if (current_state_->user_type == user_manager::USER_TYPE_KIOSK_APP)
return KIOSK_ACCOUNT_LOGIN;
- if (current_state_->user_type == user_manager::USER_TYPE_LOCALLY_MANAGED)
- return LOCALLY_MANAGED_USER_LOGIN;
+ if (current_state_->user_type == user_manager::USER_TYPE_SUPERVISED)
+ return SUPERVISED_USER_LOGIN;
if (!VerifyOwner())
return CONTINUE;
« no previous file with comments | « chrome/browser/chromeos/login/auth/parallel_authenticator.h ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698