components/user_manager/user.cc - Issue 1440583002: This CL replaces e-mail with AccountId on user selection screen.

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: components/user_manager/user.cc

Issue 1440583002: This CL replaces e-mail with AccountId on user selection screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix build. Created 5 years, 1 month 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

Index: components/user_manager/user.cc

diff --git a/components/user_manager/user.cc b/components/user_manager/user.cc

index 39ef430d5baef8a8ba9065dbcc384d5ae5c68c92..3ead4164e3c836dcb0f8fc1c7b258f44a8a8d2bd 100644

--- a/components/user_manager/user.cc

+++ b/components/user_manager/user.cc

@@ -123,9 +123,8 @@ const gfx::ImageSkia& User::GetImage() const {

return user_image_.image();

}

-AccountId User::GetAccountId() const {

- return AccountId::FromUserEmail(

- gaia::CanonicalizeEmail(gaia::SanitizeEmail(email())));

+const AccountId& User::GetAccountId() const {

+ return account_id_;

}

void User::SetIsChild(bool is_child) {

« no previous file with comments | « components/user_manager/user.h ('k') | components/user_manager/user_info.h » ('j') | no next file with comments »