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

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

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. Created 4 years, 10 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
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 f911bf72bb70b500cb554d56270098b9ab85a61b..7552252dce52d32ff8fb5957e8868f44160edb07 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -988,7 +988,7 @@ void SigninScreenHandler::HandleAuthenticateUser(const AccountId& account_id,
}
void SigninScreenHandler::HandleLaunchIncognito() {
- UserContext context(user_manager::USER_TYPE_GUEST, std::string());
+ UserContext context(user_manager::USER_TYPE_GUEST, EmptyAccountId());
if (delegate_)
delegate_->Login(context, SigninSpecifics());
}
@@ -1009,8 +1009,7 @@ void SigninScreenHandler::HandleLaunchPublicSession(
if (!delegate_)
return;
- UserContext context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
- account_id.GetUserEmail());
+ UserContext context(user_manager::USER_TYPE_PUBLIC_ACCOUNT, account_id);
context.SetPublicSessionLocale(locale),
context.SetPublicSessionInputMethod(input_method);
delegate_->Login(context, SigninSpecifics());
@@ -1263,8 +1262,7 @@ void SigninScreenHandler::SendPublicSessionKeyboardLayouts(
void SigninScreenHandler::HandleLaunchKioskApp(const AccountId& app_account_id,
bool diagnostic_mode) {
- UserContext context(user_manager::USER_TYPE_KIOSK_APP,
- app_account_id.GetUserEmail());
+ UserContext context(user_manager::USER_TYPE_KIOSK_APP, app_account_id);
SigninSpecifics specifics;
specifics.kiosk_diagnostic_mode = diagnostic_mode;
if (delegate_)

Powered by Google App Engine
This is Rietveld 408576698