diff options
| author | alemate <alemate@chromium.org> | 2015-10-22 18:42:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 01:43:24 +0000 |
| commit | 62cbf95a4287a952d7e6cb9794d41402502bc116 (patch) | |
| tree | 758704888947d7abb8568f6715f3958add2cde1d /chromeos/login/auth | |
| parent | 12a2855d605f20e3e7803e4e6ffad259201e204c (diff) | |
| download | chromium_src-62cbf95a4287a952d7e6cb9794d41402502bc116.zip chromium_src-62cbf95a4287a952d7e6cb9794d41402502bc116.tar.gz chromium_src-62cbf95a4287a952d7e6cb9794d41402502bc116.tar.bz2 | |
This CL replaces chromeos::login::k*UserName constants with AccountId.
This CL replaces most of use of kSignInUser, kStubUser, kGuestUserName
with matching AccountIds.
This is part of transition to AccountId.
BUG=468875
TEST=manual
Review URL: https://codereview.chromium.org/1415343002
Cr-Commit-Position: refs/heads/master@{#355703}
Diffstat (limited to 'chromeos/login/auth')
| -rw-r--r-- | chromeos/login/auth/cryptohome_authenticator.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromeos/login/auth/cryptohome_authenticator.cc b/chromeos/login/auth/cryptohome_authenticator.cc index 4321adf..156a66d 100644 --- a/chromeos/login/auth/cryptohome_authenticator.cc +++ b/chromeos/login/auth/cryptohome_authenticator.cc @@ -25,6 +25,7 @@ #include "chromeos/login/user_names.h" #include "chromeos/login_event_recorder.h" #include "components/device_event_log/device_event_log.h" +#include "components/signin/core/account_id/account_id.h" #include "components/user_manager/user_type.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -460,7 +461,7 @@ void CryptohomeAuthenticator::LoginOffTheRecord() { DCHECK(task_runner_->RunsTasksOnCurrentThread()); current_state_.reset( new AuthAttemptState(UserContext(user_manager::USER_TYPE_GUEST, - chromeos::login::kGuestUserName), + login::GuestAccountId().GetUserEmail()), false, // unlock false, // online_complete false)); // user_is_new @@ -493,7 +494,7 @@ void CryptohomeAuthenticator::LoginAsKioskAccount( DCHECK(task_runner_->RunsTasksOnCurrentThread()); const std::string user_id = - use_guest_mount ? chromeos::login::kGuestUserName : app_user_id; + use_guest_mount ? login::GuestAccountId().GetUserEmail() : app_user_id; current_state_.reset(new AuthAttemptState( UserContext(user_manager::USER_TYPE_KIOSK_APP, user_id), false, // unlock |