chrome/browser/chromeos/app_mode/kiosk_profile_loader.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/app_mode/kiosk_profile_loader.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: Update after review. 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/app_mode/kiosk_app_manager.cc ('K') | « chrome/browser/chromeos/app_mode/kiosk_app_manager.cc ('k') | chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc » ('j') | chrome/browser/chromeos/login/app_launch_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc

diff --git a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc

index 638fdb0c22a925bb877769c3157ded1420524f42..5612da0f3753ab1849b83916c5b388035ad7ec61 100644

--- a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc

+++ b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc

@@ -158,7 +158,7 @@ void KioskProfileLoader::OnAuthSuccess(const UserContext& user_context) {

// we switch this back to the demo user name to correctly identify this

// user as a demo user.

UserContext context = user_context;

- if (context.GetUserID() == chromeos::login::kGuestUserName)

+ if (context.GetAccountId() == login::GuestAccountId())

context.SetUserID(login::DemoAccountId().GetUserEmail());

UserSessionManager::GetInstance()->StartSession(

context, UserSessionManager::PRIMARY_USER_SESSION,