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 61441192b8638a6eb161095db58180aec7efa65f..2fa3eb5142f9e84a7a0919ab04bb8cc88b197ac8 100644 |
--- a/chrome/browser/signin/easy_unlock_service.cc |
+++ b/chrome/browser/signin/easy_unlock_service.cc |
@@ -208,6 +208,10 @@ EasyUnlockService::~EasyUnlockService() { |
void EasyUnlockService::RegisterProfilePrefs( |
user_prefs::PrefRegistrySyncable* registry) { |
registry->RegisterBooleanPref( |
+ prefs::kEasyUnlockAllowed, |
+ true, |
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry->RegisterBooleanPref( |
prefs::kEasyUnlockEnabled, |
false, |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
@@ -216,9 +220,9 @@ void EasyUnlockService::RegisterProfilePrefs( |
new base::DictionaryValue(), |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
registry->RegisterBooleanPref( |
- prefs::kEasyUnlockAllowed, |
- true, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ prefs::kEasyUnlockProximityRequired, |
+ false, |
+ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
} |
// static |