chrome/browser/signin/easy_unlock_auth_attempt.cc - Issue 1372283002: Hook up ProximityAuthSystem in EasyUnlockService.

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/signin/easy_unlock_auth_attempt.cc

Issue 1372283002: Hook up ProximityAuthSystem in EasyUnlockService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth_connection

Patch Set: fix msan tests Created 5 years, 3 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/signin/chrome_proximity_auth_client.cc ('k') | chrome/browser/signin/easy_unlock_service.h » ('j') | components/proximity_auth/messenger_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/easy_unlock_auth_attempt.cc

diff --git a/chrome/browser/signin/easy_unlock_auth_attempt.cc b/chrome/browser/signin/easy_unlock_auth_attempt.cc

index 9b82890ce93d815b901065c7efcdf6ee19b42990..922ec204b9220c65fd14d9951e1bcfdaebf33010 100644

--- a/chrome/browser/signin/easy_unlock_auth_attempt.cc

+++ b/chrome/browser/signin/easy_unlock_auth_attempt.cc

@@ -118,15 +118,7 @@ bool EasyUnlockAuthAttempt::Start() {

state_ = STATE_RUNNING;

- // We need this workaround for ProximityAuthBleSystem, which is already

- // notified in EasyUnlockService. No notification is sent when only the

- // |kEnableBluetoothLowEnergyDiscovery| flag is set, and

- // |app_manager_->SendAuthAttemptEvent()| returns false. As a result, the auth

- // attempt will always fail.

- // TODO(sacomoto): Remove this when it's not needed anymore.

- if (!app_manager_->SendAuthAttemptEvent() &&

- !base::CommandLine::ForCurrentProcess()->HasSwitch(

- proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)) {

+ if (!app_manager_->SendAuthAttemptEvent()) {

Cancel(user_id_);

return false;

}