chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h - Issue 1229883003: ChromeOS: should send old user GAPS cookie to GAIA on user reauthentication.

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

Issue 1229883003: ChromeOS: should send old user GAPS cookie to GAIA on user reauthentication. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. Created 5 years, 5 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/resources/gaia_auth_host/authenticator.js ('K') | « chrome/browser/resources/gaia_auth_host/authenticator.js ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('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.h

diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

index 7a7575c1977487ba4b9d357a6d2bf2e7e0db32b3..522d17ab5a2de76a6b2c9be825f75377b7c9d6ec 100644

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

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

@@ -53,6 +53,9 @@ struct GaiaContext {

// GAIA ID of the current user.

std::string gaia_id;

+ // GAPS cookie.

+ std::string gaps_cookie;

// Whether consumer management enrollment is in progress.

bool is_enrolling_consumer_management;

};

@@ -115,7 +118,8 @@ class GaiaScreenHandler : public BaseScreenHandler {

const std::string& email,

const std::string& password,

const std::string& auth_code,

- bool using_saml);

+ bool using_saml,

+ const std::string& gaps_cookie);

void HandleCompleteAuthenticationAuthCodeOnly(const std::string& auth_code);

void HandleCompleteLogin(const std::string& gaia_id,

const std::string& typed_email,