chrome/browser/chromeos/login/lock/screen_locker.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/lock/screen_locker.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Rebased. Created 5 years, 2 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

« chrome/browser/chromeos/login/kiosk_browsertest.cc ('K') | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc » ('j') | chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/lock/screen_locker.cc

diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc

index eea1b56bd8032eb74fffaea8f9d4c552f5c2feb2..d0aa1747ae7721758ae6d40fd3e61f02f3490734 100644

--- a/chrome/browser/chromeos/login/lock/screen_locker.cc

+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc

@@ -250,7 +250,7 @@ void ScreenLocker::UnlockOnLoginSuccess() {

}

void ScreenLocker::Authenticate(const UserContext& user_context) {

- LOG_ASSERT(IsUserLoggedIn(user_context.GetUserID()))

+ LOG_ASSERT(IsUserLoggedIn(user_context.GetUserID().GetUserEmail()))

<< "Invalid user trying to unlock.";

authentication_start_time_ = base::Time::Now();

@@ -259,7 +259,7 @@ void ScreenLocker::Authenticate(const UserContext& user_context) {

// Special case: supervised users. Use special authenticator.

if (const user_manager::User* user =

- FindUnlockUser(user_context.GetUserID())) {

+ FindUnlockUser(user_context.GetUserID().GetUserEmail())) {

if (user->GetType() == user_manager::USER_TYPE_SUPERVISED) {

UserContext updated_context = ChromeUserManager::Get()

->GetSupervisedUserManager()