Chromium Code Reviews| Index: chrome/browser/profiles/profile.cc |
| diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc |
| index 74525c7c2b546f9bfa2bdd1d514d2447e56d6e6e..9ab4ed7a34346e97aa8ee1ea154cd6f1c1c9dd2c 100644 |
| --- a/chrome/browser/profiles/profile.cc |
| +++ b/chrome/browser/profiles/profile.cc |
| @@ -27,6 +27,7 @@ |
| #if defined(OS_CHROMEOS) |
| #include "base/command_line.h" |
| +#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chromeos/chromeos_switches.h" |
| #endif |
| @@ -177,6 +178,14 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| // 0 indicates no maximum length for the pin. |
| registry->RegisterIntegerPref(prefs::kPinUnlockMaximumLength, 0); |
| registry->RegisterBooleanPref(prefs::kPinUnlockAllowEasyPins, true); |
| + |
| + base::ListValue screen_unlock_whitelist_default; |
| + screen_unlock_whitelist_default.AppendString("password"); |
| + registry->RegisterListPref(prefs::kScreenUnlockWhitelist, |
| + screen_unlock_whitelist_default.DeepCopy()); |
| + registry->RegisterIntegerPref( |
| + prefs::kScreenUnlockPasswordConfirmationFrequency, |
| + static_cast<int>(chromeos::PasswordConfirmation::DAY)); |
|
jdufault
2016/10/04 23:26:21
int{}
sammiequon
2016/10/18 22:47:49
int{} will cause compiler error.
|
| #endif |
| } |