chrome/browser/chromeos/login/app_launch_signin_screen.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/app_launch_signin_screen.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/input_method/input_method_persistence_unittest.cc ('K') | « chrome/browser/chromeos/login/app_launch_controller.cc ('k') | chrome/browser/chromeos/login/auth/chrome_login_performer.cc » ('j') | chrome/browser/chromeos/login/existing_user_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/app_launch_signin_screen.cc

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

index 8affe3028944b14f1d0f41776960e716e5de899b..3595dea02e2f094f84fefd1cc98c7aa444bfcf9e 100644

--- a/chrome/browser/chromeos/login/app_launch_signin_screen.cc

+++ b/chrome/browser/chromeos/login/app_launch_signin_screen.cc

@@ -42,7 +42,7 @@ void AppLaunchSigninScreen::Show() {

void AppLaunchSigninScreen::InitOwnerUserList() {

user_manager::UserManager* user_manager = GetUserManager();

- const std::string& owner_email = user_manager->GetOwnerEmail();

+ const std::string& owner_email = user_manager->GetOwnerId().GetUserEmail();

const user_manager::UserList& all_users = user_manager->GetUsers();

owner_user_list_.clear();