chromeos: Replace scale-delays-for-presentation-mode pref.
This replaces the kPowerPresentationIdleDelayFactor pref
with kPowerPresentationScreenDimDelayFactor. The former
scaled the idle delay and then adjusted the other delays;
the latter scales the screen-dim delay before adjusting
other delays.
It also updates the cros_system_api dependency to d2d441c1.
BUG=chromium:248276
Review URL: https://chromiumcodereview.appspot.com/16677007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205905 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index da7dfcbf..41b3e64 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -394,6 +394,10 @@
2.0,
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
+ prefs::kPowerPresentationScreenDimDelayFactor,
+ 2.0,
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterDoublePref(
prefs::kPowerUserActivityScreenDimDelayFactor,
2.0,
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ -529,8 +533,8 @@
prefs::kPowerUseVideoActivity, prefs, callback);
power_allow_screen_wake_locks_.Init(
prefs::kPowerAllowScreenWakeLocks, prefs, callback);
- power_presentation_idle_delay_factor_.Init(
- prefs::kPowerPresentationIdleDelayFactor, prefs, callback);
+ power_presentation_screen_dim_delay_factor_.Init(
+ prefs::kPowerPresentationScreenDimDelayFactor, prefs, callback);
power_user_activity_screen_dim_delay_factor_.Init(
prefs::kPowerUserActivityScreenDimDelayFactor, prefs, callback);
}
@@ -856,7 +860,7 @@
*pref_name == prefs::kPowerUseAudioActivity ||
*pref_name == prefs::kPowerUseVideoActivity ||
*pref_name == prefs::kPowerAllowScreenWakeLocks ||
- *pref_name == prefs::kPowerPresentationIdleDelayFactor ||
+ *pref_name == prefs::kPowerPresentationScreenDimDelayFactor ||
*pref_name == prefs::kPowerUserActivityScreenDimDelayFactor ||
*pref_name == prefs::kEnableScreenLock) {
PowerPolicyController::PrefValues values;
@@ -883,8 +887,8 @@
values.use_video_activity = power_use_video_activity_.GetValue();
values.allow_screen_wake_locks = power_allow_screen_wake_locks_.GetValue();
values.enable_screen_lock = enable_screen_lock_.GetValue();
- values.presentation_idle_delay_factor =
- power_presentation_idle_delay_factor_.GetValue();
+ values.presentation_screen_dim_delay_factor =
+ power_presentation_screen_dim_delay_factor_.GetValue();
values.user_activity_screen_dim_delay_factor =
power_user_activity_screen_dim_delay_factor_.GetValue();
