chrome/browser/chromeos/login/screens/user_image_screen.cc - Issue 1425093004: Revert of 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/screens/user_image_screen.cc

Issue 1425093004: Revert of 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: 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

« no previous file with comments | « chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/user_image_screen.cc

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

index 091e8e73aaddf15d99b4498283dd30ce32dd2761..780554364c1e960592c28d09f05a4c5ed87a1709 100644

--- a/chrome/browser/chromeos/login/screens/user_image_screen.cc

+++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc

@@ -111,7 +111,7 @@

void UserImageScreen::HideCurtain() {

// Skip user image selection for ephemeral users.

if (user_manager::UserManager::Get()->IsUserNonCryptohomeDataEphemeral(

- GetUser()->GetAccountId())) {

+ GetUser()->GetUserID())) {

ExitScreen();

}

if (view_)

@@ -227,8 +227,7 @@

}

UserImageManager* UserImageScreen::GetUserImageManager() {

- return ChromeUserManager::Get()->GetUserImageManager(

- GetUser()->GetAccountId());

+ return ChromeUserManager::Get()->GetUserImageManager(GetUser()->email());

}

UserImageSyncObserver* UserImageScreen::GetSyncObserver() {