chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc - Issue 1497973002: This CL replaces e-mail with AccountId in wallpaper manager code.

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/chromeos/login/gaia_screen_handler.cc

Issue 1497973002: This CL replaces e-mail with AccountId in wallpaper manager code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. Created 5 years 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/ui/ash/multi_user/user_switch_animator_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

index ef288e4acc87a5a17c5c013db8bfef4cf347a760..1b7f80f69152fe012c0d135ad167866df3af3d1c 100644

--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

@@ -741,10 +741,13 @@ void GaiaScreenHandler::ShowGaiaScreenIfReady() {

}

// Note that LoadAuthExtension clears |populated_email_|.

- if (populated_email_.empty())

+ if (populated_email_.empty()) {

Delegate()->LoadSigninWallpaper();

- else

- Delegate()->LoadWallpaper(populated_email_);

+ } else {

+ Delegate()->LoadWallpaper(

+ user_manager::UserManager::Get()->GetKnownUserAccountId(

+ populated_email_, std::string()));

+ }

input_method::InputMethodManager* imm =

input_method::InputMethodManager::Get();