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

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

Issue 1372283002: 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
Index: chrome/browser/signin/easy_unlock_app_manager.cc
diff --git a/chrome/browser/signin/easy_unlock_app_manager.cc b/chrome/browser/signin/easy_unlock_app_manager.cc
index 62bdf66948174e1af899c59f64c9f7e712176aa3..9c5c6df1ac7616d167714ab22c611962923e6e8f 100644
--- a/chrome/browser/signin/easy_unlock_app_manager.cc
+++ b/chrome/browser/signin/easy_unlock_app_manager.cc
@@ -90,6 +90,10 @@ void EasyUnlockAppManagerImpl::LaunchSetup() {
}
void EasyUnlockAppManagerImpl::LoadApp() {
sacomoto 2015/09/29 18:45:57 Please add a TODO here.
Tim Song 2015/09/30 00:05:04 Done.
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery))
+ return;
+
ExtensionService* extension_service = extension_system_->extension_service();
if (!extension_service)
return;

Powered by Google App Engine
This is Rietveld 408576698