chrome/browser/chromeos/login/screens/user_selection_screen.h - Issue 1494153002: This CL replaces e-mail with AccountId in easy signin code.

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/chromeos/login/screens/user_selection_screen.h

Issue 1494153002: This CL replaces e-mail with AccountId in easy signin code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bugfix in original easy unlock code' Created 5 years 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/chromeos/login/lock/webui_screen_locker.cc ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/user_selection_screen.h

diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h

index 70faa8be9038738488619f23412849fbe30d0c3c..2ec86fb076863fbf7c89270cb985a347a9ecc974 100644

--- a/chrome/browser/chromeos/login/screens/user_selection_screen.h

+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h

@@ -64,20 +64,20 @@ class UserSelectionScreen

// proximity_auth::ScreenlockBridge::LockHandler implementation:

void ShowBannerMessage(const base::string16& message) override;

void ShowUserPodCustomIcon(

- const std::string& user_email,

+ const AccountId& account_id,

const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions& icon)

override;

- void HideUserPodCustomIcon(const std::string& user_email) override;

+ void HideUserPodCustomIcon(const AccountId& account_id) override;

void EnableInput() override;

- void SetAuthType(const std::string& user_email,

+ void SetAuthType(const AccountId& account_id,

AuthType auth_type,

const base::string16& auth_value) override;

- AuthType GetAuthType(const std::string& user_email) const override;

+ AuthType GetAuthType(const AccountId& account_id) const override;

ScreenType GetScreenType() const override;

- void Unlock(const std::string& user_email) override;

- void AttemptEasySignin(const std::string& user_email,

+ void Unlock(const AccountId& account_id) override;

+ void AttemptEasySignin(const AccountId& account_id,

const std::string& secret,

const std::string& key_label) override;