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

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

Issue 1454153002: Revert of This CL replaces e-mail with AccountId on user selection screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: 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 9f0ae2a38ff826ea84128485f332f464cb150e6c..e0523daaa94c3956972a3bb755988cd95525c5e1 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -834,11 +834,9 @@
context.is_enrolling_consumer_management = is_enrolling_consumer_management_;
std::string gaia_id;
- if (!context.email.empty() &&
- user_manager::UserManager::Get()->FindGaiaID(
- AccountId::FromUserEmail(context.email), &gaia_id)) {
+ if (user_manager::UserManager::Get()->FindGaiaID(
+ AccountId::FromUserEmail(context.email), &gaia_id))
context.gaia_id = gaia_id;
- }
if (Delegate()) {
context.show_users = Delegate()->IsShowUsers();

Powered by Google App Engine
This is Rietveld 408576698