chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc - Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier.

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 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

« chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc ('K') | « chrome/browser/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | chromeos/attestation/mock_attestation_flow.cc » ('J')
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 c25df9741018cf2b0f77917c669488840599d74a..57fdb115c02aeaf2be94fcd7eaefe1d7020908a2 100644

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

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

@@ -441,7 +441,6 @@ void GaiaScreenHandler::HandleCompleteAuthentication(

Delegate()->SetDisplayEmail(sanitized_email);

UserContext user_context(GetAccountId(email, gaia_id));

- user_context.SetGaiaID(gaia_id);

user_context.SetKey(Key(password));

user_context.SetAuthCode(auth_code);

user_context.SetAuthFlow(using_saml

@@ -525,7 +524,6 @@ void GaiaScreenHandler::DoCompleteLogin(const std::string& gaia_id,

const std::string sanitized_email = gaia::SanitizeEmail(typed_email);

Delegate()->SetDisplayEmail(sanitized_email);

UserContext user_context(GetAccountId(typed_email, gaia_id));

- user_context.SetGaiaID(gaia_id);

user_context.SetKey(Key(password));

user_context.SetAuthFlow(using_saml

? UserContext::AUTH_FLOW_GAIA_WITH_SAML