chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc - Issue 1021383002: cros: Transfer auth cookies for SAML webview sign-in.

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 1021383002: cros: Transfer auth cookies for SAML webview sign-in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase, break UserCloudPolicyManagerChromeOS dependency on UserSessionManager to fix tests Created 5 years, 9 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/ui/webui/chromeos/login/base_screen_handler.h ('K') | « chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h ('k') | components/login/base_screen_handler_utils.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 d98dce5ad893b05caa2015038cbc61cd0c4e3c11..47af3d4c51cb9892a21a423526b0133f7bc71fc0 100644

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

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

@@ -402,7 +402,8 @@ void GaiaScreenHandler::HandleCompleteAuthentication(

const std::string& gaia_id,

const std::string& email,

const std::string& password,

- const std::string& auth_code) {

+ const std::string& auth_code,

+ bool using_saml) {

if (!Delegate())

return;

@@ -416,6 +417,9 @@ void GaiaScreenHandler::HandleCompleteAuthentication(

user_context.SetGaiaID(gaia_id);

user_context.SetKey(Key(password));

user_context.SetAuthCode(auth_code);

+ user_context.SetAuthFlow(using_saml

+ ? UserContext::AUTH_FLOW_GAIA_WITH_SAML

+ : UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);

Delegate()->CompleteLogin(user_context);

}