chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc - Issue 1113043004: [Smart Lock] Extract the screenlock state to the proximity_auth component.

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/easy_unlock/bootstrap_user_context_initializer.cc

Issue 1113043004: [Smart Lock] Extract the screenlock state to the proximity_auth component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit tests compile Created 5 years, 8 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/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h ('k') | chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc b/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

index b83e9ee5efe0ef4dbc158ddde36ac405284e1a75..6338752ac32a1240e4ca9cd19e3c7ccfc3489fe9 100644

--- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

@@ -192,10 +192,10 @@ void BootstrapUserContextInitializer::OnNetworkError(int response_code) {

}

void BootstrapUserContextInitializer::OnScreenlockStateChanged(

- EasyUnlockScreenlockStateHandler::State state) {

+ proximity_auth::ScreenlockState state) {

// TODO(xiyuan): Add timeout and hook up with error UI after

// http://crbug.com/471067.

- if (state != EasyUnlockScreenlockStateHandler::STATE_AUTHENTICATED)

+ if (state != proximity_auth::ScreenlockState::AUTHENTICATED)

return;

EasyUnlockService* service =