| Index: chrome/browser/profiles/profile.cc
|
| diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
|
| index ce0ced0aaa74e079470e3a385011612f69a83128..49a7ea80698de5fc4c6fc4f3ca9a20385a920f5b 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
|
| @@ -171,6 +172,14 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
|
|
| #if defined(OS_CHROMEOS)
|
| registry->RegisterBooleanPref(prefs::kAllowScreenLock, true);
|
| +
|
| + base::ListValue screen_unlock_whitelist_default;
|
| + screen_unlock_whitelist_default.AppendString("password");
|
| + registry->RegisterListPref(prefs::kQuickUnlockModeWhitelist,
|
| + screen_unlock_whitelist_default.DeepCopy());
|
| + registry->RegisterIntegerPref(
|
| + prefs::kQuickUnlockTimeout,
|
| + static_cast<int>(chromeos::PasswordConfirmationFrequency::DAY));
|
| #endif
|
| }
|
|
|
|
|