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

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

Issue 546163005: easy-unlock: Make policy fully override field trial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc » ('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 b86a311f0cd9d35ad9c4f2e0abbf89c377a19479..b7812f64181ca0004bd2ec12ba27c920a19b7545 100644
--- a/chrome/browser/signin/easy_unlock_service.cc
+++ b/chrome/browser/signin/easy_unlock_service.cc
@@ -196,9 +196,12 @@ bool EasyUnlockService::IsAllowed() {
if (!profile_->GetPrefs()->GetBoolean(prefs::kEasyUnlockAllowed))
return false;
- // It is disabled when the trial exists and is in "Disable" group.
- if (base::FieldTrialList::FindFullName("EasyUnlock") == "Disable")
- return false;
+ // Respect existing policy and skip finch test.
+ if (!profile_->GetPrefs()->IsManagedPreference(prefs::kEasyUnlockAllowed)) {
+ // It is disabled when the trial exists and is in "Disable" group.
+ if (base::FieldTrialList::FindFullName("EasyUnlock") == "Disable")
+ return false;
+ }
if (!bluetooth_detector_->IsPresent())
return false;
« no previous file with comments | « no previous file | chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698