chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc - Issue 606083002: patch from issue 473153002

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 606083002: patch from issue 473153002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix saml Created 6 years, 3 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:

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 dab8ff042c36d1413eed71e78f28c50566e527ba..721cddda0ea3617bee89700d87b4d46096351fce 100644

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

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

@@ -301,6 +301,7 @@ void GaiaScreenHandler::HandleFrameLoadingCompleted(int status) {

}

void GaiaScreenHandler::HandleCompleteAuthentication(

+ const std::string& gaia_id,

const std::string& email,

const std::string& password,

const std::string& auth_code) {

@@ -313,7 +314,8 @@ void GaiaScreenHandler::HandleCompleteAuthentication(

Delegate()->CompleteLogin(user_context);

}

-void GaiaScreenHandler::HandleCompleteLogin(const std::string& typed_email,

+void GaiaScreenHandler::HandleCompleteLogin(const std::string& gaia_id,

+ const std::string& typed_email,

const std::string& password,

bool using_saml) {

if (!is_enrolling_consumer_management_) {