chrome/browser/ui/webui/options/chromeos/user_image_source.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/ui/webui/options/chromeos/user_image_source.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/ui/webui/options/chromeos/shared_options_browsertest.cc ('K') | « chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc ('k') | chromeos/login/auth/cryptohome_authenticator.cc » ('j') | chromeos/login/auth/extended_authenticator_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/user_image_source.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc

index 71a03b71f729db6bf3023771b27475d2d2252aaa..430b34dc5eeaf804c08b66fec7366ce00c9cafcd 100644

--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc

+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc

@@ -39,8 +39,8 @@ namespace options {

base::RefCountedMemory* UserImageSource::GetUserImage(

const std::string& email,

stevenjb 2015/10/22 17:52:36 It looks like we only call this once, it should ta

Alexander Alekseev 2015/10/23 09:11:24 Done.

ui::ScaleFactor scale_factor) {

- const user_manager::User* user =

- user_manager::UserManager::Get()->FindUser(email);

+ const user_manager::User* user = user_manager::UserManager::Get()->FindUser(

+ AccountId::FromUserEmail(email));

if (user) {

if (user->has_raw_image()) {

return new base::RefCountedBytes(user->raw_image());