Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3081)

Unified Diff: chrome/browser/signin/easy_unlock_auth_attempt.cc

Issue 1377313002: Revert of Hook up ProximityAuthSystem in EasyUnlockService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth_connection
Patch Set: 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') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 922ec204b9220c65fd14d9951e1bcfdaebf33010..9b82890ce93d815b901065c7efcdf6ee19b42990 100644
--- a/chrome/browser/signin/easy_unlock_auth_attempt.cc
+++ b/chrome/browser/signin/easy_unlock_auth_attempt.cc
@@ -118,7 +118,15 @@
state_ = STATE_RUNNING;
- if (!app_manager_->SendAuthAttemptEvent()) {
+ // 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)) {
Cancel(user_id_);
return false;
}
« no previous file with comments | « chrome/browser/signin/chrome_proximity_auth_client.cc ('k') | chrome/browser/signin/easy_unlock_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698