chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

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/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc ('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 d37fa1ae50b8d1db6c88921164523219b1a3e7ac..250d74c1756c3eea08918bef0c5123a3e9c450ca 100644

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

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

@@ -16,8 +16,6 @@

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chromeos/network/portal_detector/network_portal_detector.h"

#include "net/base/net_errors.h"

-class AccountId;

namespace policy {

class ConsumerManagementService;

@@ -217,8 +215,8 @@

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

// user has already signed in.

- AccountId GetAccountId(const std::string& authenticated_email,

- const std::string& gaia_id) const;

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

+ const std::string& gaia_id) const;

// Returns current visible screen.

// TODO(jdufault): This definition exists in multiple locations. Refactor it