chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h - Issue 1394723002: This CL fixes the issue with login using alternative e-mails.

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 1394723002: This CL fixes the issue with login using alternative e-mails. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2526

Patch Set: Created 5 years, 2 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

« no previous file with comments | « chrome/browser/resources/chromeos/login/login_common.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 e21b6be21a82d69e1fddb84335e3d0754f13d133..ef938358cf01f99aaeb5496c543bbf38655f8d60 100644

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

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

@@ -217,6 +217,11 @@ class GaiaScreenHandler : public BaseScreenHandler,

FrameState frame_state() const { return frame_state_; }

net::Error frame_error() const { return frame_error_; }

+ // Returns user canonical e-mail. Finds already used account alias, if

+ // user has already signed in.

+ std::string GetCanonicalEmail(const std::string& authenticated_email,

+ const std::string& gaia_id) const;

// Current state of Gaia frame.

FrameState frame_state_ = FRAME_STATE_UNKNOWN;