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

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

Issue 2899593002: [EasyUnlock] Put entire ChromeOS login flow behind a flag. (Closed)
Patch Set: [EasyUnlock] Put entire ChromeOS login flow behind a flag. Created 3 years, 7 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/screenlock_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
diff --git a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
index fc71efaa6848bfb8eb039ef278b3b3623ded45a0..3e90a3c250a14c02365c6b30ec995401886ea9db 100644
--- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
@@ -266,6 +266,13 @@ void EasyUnlockServiceSignin::InitializeInternal() {
if (chromeos::LoginState::Get()->IsUserLoggedIn())
return;
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery) &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ proximity_auth::switches::kEnableChromeOSLogin)) {
+ return;
+ }
+
service_active_ = true;
chromeos::LoginState::Get()->AddObserver(this);
« no previous file with comments | « no previous file | components/proximity_auth/screenlock_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698