Index: chrome/browser/chromeos/preferences.cc |
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc |
index b619280776ee54ab400aea7b00daf62efdaef9e9..dd3b7b81c883afa567bf62f09372544150772823 100644 |
--- a/chrome/browser/chromeos/preferences.cc |
+++ b/chrome/browser/chromeos/preferences.cc |
@@ -284,7 +284,6 @@ void Preferences::RegisterUserPrefs( |
language_prefs::kXkbAutoRepeatIntervalInMs, |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- // Screen lock default to off. |
registry->RegisterBooleanPref( |
prefs::kEnableScreenLock, |
false, |
@@ -323,7 +322,7 @@ void Preferences::RegisterUserPrefs( |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
registry->RegisterIntegerPref( |
prefs::kPowerAcScreenLockDelayMs, |
- 0, |
+ 490000, |
Mattias Nissler (ping if slow)
2013/05/31 13:22:46
This would be 0 again.
|
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
registry->RegisterIntegerPref( |
prefs::kPowerAcIdleWarningDelayMs, |
@@ -343,7 +342,7 @@ void Preferences::RegisterUserPrefs( |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
registry->RegisterIntegerPref( |
prefs::kPowerBatteryScreenLockDelayMs, |
- 0, |
+ 370000, |
Mattias Nissler (ping if slow)
2013/05/31 13:22:46
Same here.
|
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
registry->RegisterIntegerPref( |
prefs::kPowerBatteryIdleWarningDelayMs, |