chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc - 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/extensions/api/screenlock_private/screenlock_private_api.cc

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/extensions/api/screenlock_private/screenlock_private_api.h ('k') | chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc

diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc

index f93b1ef613988ad55c5b0d263d0613e172cdba75..e63932b1bfb1cd32fe5f8ef89348d5c93de769aa 100644

--- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc

+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc

@@ -79,8 +79,8 @@ bool ScreenlockPrivateSetLockedFunction::RunAsync() {

}

proximity_auth::ScreenlockBridge::Get()->Lock();

} else {

- proximity_auth::ScreenlockBridge::Get()->Unlock(

- service->proximity_auth_client()->GetAuthenticatedUsername());

+ proximity_auth::ScreenlockBridge::Get()->Unlock(AccountId::FromUserEmail(

+ service->proximity_auth_client()->GetAuthenticatedUsername()));

}

SendResponse(error_.empty());

return true;

@@ -127,8 +127,7 @@ void ScreenlockPrivateEventRouter::OnScreenDidUnlock(

}

void ScreenlockPrivateEventRouter::OnFocusedUserChanged(

- const std::string& user_id) {

+ const AccountId& account_id) {}

void ScreenlockPrivateEventRouter::DispatchEvent(

events::HistogramValue histogram_value,