Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1960)

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 1494153002: This CL replaces e-mail with AccountId in easy signin 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
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index a1f1a7223b23bea666b926cc7d9d94c3c0e90a87..323bf17cc7203494b8877110c53bddc9a643ab30 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -296,7 +296,7 @@ SigninScreenHandler::~SigninScreenHandler() {
max_mode_delegate_.reset(nullptr);
}
proximity_auth::ScreenlockBridge::Get()->SetLockHandler(nullptr);
- proximity_auth::ScreenlockBridge::Get()->SetFocusedUser("");
+ proximity_auth::ScreenlockBridge::Get()->SetFocusedUser(EmptyAccountId());
}
// static
@@ -1241,8 +1241,7 @@ void SigninScreenHandler::HandleShowLoadingTimeoutError() {
void SigninScreenHandler::HandleFocusPod(const AccountId& account_id) {
SetUserInputMethod(account_id.GetUserEmail(), ime_state_.get());
WallpaperManager::Get()->SetUserWallpaperDelayed(account_id.GetUserEmail());
- proximity_auth::ScreenlockBridge::Get()->SetFocusedUser(
- account_id.GetUserEmail());
+ proximity_auth::ScreenlockBridge::Get()->SetFocusedUser(account_id);
if (delegate_)
delegate_->CheckUserStatus(account_id);
if (!test_focus_pod_callback_.is_null())

Powered by Google App Engine
This is Rietveld 408576698