| Index: chrome/browser/policy/configuration_policy_handler_list.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc
|
| index a80912b3a87f92c2d003c4ee43dbb2c487e38810..3f044b0c00e88d865d6d25fb1724f51c3a5ae391 100644
|
| --- a/chrome/browser/policy/configuration_policy_handler_list.cc
|
| +++ b/chrome/browser/policy/configuration_policy_handler_list.cc
|
| @@ -346,6 +346,42 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
|
| { key::kSessionLengthLimit,
|
| prefs::kSessionLengthLimit,
|
| Value::TYPE_INTEGER },
|
| + { key::kScreenDimDelayAC,
|
| + prefs::kPowerAcScreenDimDelayMs,
|
| + Value::TYPE_INTEGER },
|
| + { key::kScreenOffDelayAC,
|
| + prefs::kPowerAcScreenOffDelayMs,
|
| + Value::TYPE_INTEGER },
|
| + { key::kScreenLockDelayAC,
|
| + prefs::kPowerAcScreenLockDelayMs,
|
| + Value::TYPE_INTEGER },
|
| + { key::kIdleDelayAC,
|
| + prefs::kPowerAcIdleDelayMs,
|
| + Value::TYPE_INTEGER },
|
| + { key::kScreenDimDelayBattery,
|
| + prefs::kPowerBatteryScreenDimDelayMs,
|
| + Value::TYPE_INTEGER },
|
| + { key::kScreenOffDelayBattery,
|
| + prefs::kPowerBatteryScreenOffDelayMs,
|
| + Value::TYPE_INTEGER },
|
| + { key::kScreenLockDelayBattery,
|
| + prefs::kPowerBatteryScreenLockDelayMs,
|
| + Value::TYPE_INTEGER },
|
| + { key::kIdleDelayBattery,
|
| + prefs::kPowerBatteryIdleDelayMs,
|
| + Value::TYPE_INTEGER },
|
| + { key::kIdleAction,
|
| + prefs::kPowerIdleAction,
|
| + Value::TYPE_INTEGER },
|
| + { key::kLidCloseAction,
|
| + prefs::kPowerLidClosedAction,
|
| + Value::TYPE_INTEGER },
|
| + { key::kPowerManagementUsesAudioActivity,
|
| + prefs::kPowerUseAudioActivity,
|
| + Value::TYPE_BOOLEAN },
|
| + { key::kPowerManagementUsesVideoActivity,
|
| + prefs::kPowerUseVideoActivity,
|
| + Value::TYPE_BOOLEAN },
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
|
| @@ -419,6 +455,11 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() {
|
| key::kOpenNetworkConfiguration,
|
| chromeos::onc::ONC_SOURCE_USER_POLICY));
|
| handlers_.push_back(new PinnedLauncherAppsPolicyHandler());
|
| +
|
| + handlers_.push_back(
|
| + new IntPercentageToDoublePolicyHandler(
|
| + key::kPresentationIdleDelayScale,
|
| + prefs::kPowerPresentationIdleDelayFactor));
|
| #endif // defined(OS_CHROMEOS)
|
| }
|
|
|
|
|