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

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

Issue 1102473003: Unlock Chrome when a phone with Smart Lock service is found. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_screen_lock
Patch Set: Nits 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 | « no previous file | components/proximity_auth.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_service.cc
diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc
index 391c8a89955bd9487f23a85a5edcdc8a03fdc369..b3ee7d93d7ecd14b8e42c51f53aaba2f6042447c 100644
--- a/chrome/browser/signin/easy_unlock_service.cc
+++ b/chrome/browser/signin/easy_unlock_service.cc
@@ -640,9 +640,11 @@ void EasyUnlockService::UpdateAppState() {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery) &&
+ GetType() == EasyUnlockService::TYPE_REGULAR &&
!proximity_auth_ble_system_) {
proximity_auth_ble_system_.reset(
- new proximity_auth::ProximityAuthBleSystem());
+ new proximity_auth::ProximityAuthBleSystem(
+ GetScreenlockBridgeInstance(), profile_));
}
#if defined(OS_CHROMEOS)
« no previous file with comments | « no previous file | components/proximity_auth.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698