summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--chrome/browser/chromeos/preferences.cc14
-rw-r--r--chrome/browser/chromeos/preferences.h2
-rw-r--r--chrome/common/pref_names.cc9
-rw-r--r--chrome/common/pref_names.h1
-rw-r--r--chromeos/dbus/power_policy_controller.cc12
-rw-r--r--chromeos/dbus/power_policy_controller.h4
-rw-r--r--chromeos/dbus/power_policy_controller_unittest.cc4
8 files changed, 29 insertions, 19 deletions
diff --git a/DEPS b/DEPS
index 309f77b..4554bc3 100644
--- a/DEPS
+++ b/DEPS
@@ -517,7 +517,7 @@ deps_os = {
# For Linux and Chromium OS.
"src/third_party/cros_system_api":
Var("chromiumos_git") + "/platform/system_api.git" +
- "@8d7776936afd26a16ba8b5103dc8bf14276ce6b5",
+ "@d2d441c18212d24fec220a24e81cf36957c70b14",
# Note that this is different from Android's freetype repo.
"src/third_party/freetype2/src":
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index da7dfcb..41b3e64 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -394,6 +394,10 @@ void Preferences::RegisterUserPrefs(
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 @@ void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) {
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 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
*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 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
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();
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index 37be11d..e23c051 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -185,7 +185,7 @@ class Preferences : public PrefServiceSyncableObserver {
BooleanPrefMember power_use_audio_activity_;
BooleanPrefMember power_use_video_activity_;
BooleanPrefMember power_allow_screen_wake_locks_;
- DoublePrefMember power_presentation_idle_delay_factor_;
+ DoublePrefMember power_presentation_screen_dim_delay_factor_;
DoublePrefMember power_user_activity_screen_dim_delay_factor_;
DISALLOW_COPY_AND_ASSIGN(Preferences);
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 97221a3..0d49f70 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -867,11 +867,16 @@ const char kPowerUseVideoActivity[] = "power.use_video_activity";
// screen-related power management (including locking)?
const char kPowerAllowScreenWakeLocks[] = "power.allow_screen_wake_locks";
-// Amount by which the idle delay should be scaled while the system is in
-// presentation mode. Values are limited to a minimum of 1.0.
+// DEPRECATED: This is replaced by kPowerPresentationScreenDimDelayFactor
+// and has no effect.
const char kPowerPresentationIdleDelayFactor[] =
"power.presentation_idle_delay_factor";
+// Amount by which the screen-dim delay should be scaled while the system
+// is in presentation mode. Values are limited to a minimum of 1.0.
+const char kPowerPresentationScreenDimDelayFactor[] =
+ "power.presentation_screen_dim_delay_factor";
+
// Amount by which the screen-dim delay should be scaled when user activity is
// observed while the screen is dimmed or soon after the screen has been turned
// off. Values are limited to a minimum of 1.0.
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 19f610a..b25e8d7 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -313,6 +313,7 @@ extern const char kPowerUseAudioActivity[];
extern const char kPowerUseVideoActivity[];
extern const char kPowerAllowScreenWakeLocks[];
extern const char kPowerPresentationIdleDelayFactor[];
+extern const char kPowerPresentationScreenDimDelayFactor[];
extern const char kPowerUserActivityScreenDimDelayFactor[];
extern const char kTermsOfServiceURL[];
extern const char kUsedPolicyCertificatesOnce[];
diff --git a/chromeos/dbus/power_policy_controller.cc b/chromeos/dbus/power_policy_controller.cc
index 0485686..9ad9130 100644
--- a/chromeos/dbus/power_policy_controller.cc
+++ b/chromeos/dbus/power_policy_controller.cc
@@ -82,7 +82,7 @@ PowerPolicyController::PrefValues::PrefValues()
use_video_activity(true),
allow_screen_wake_locks(true),
enable_screen_lock(false),
- presentation_idle_delay_factor(2.0),
+ presentation_screen_dim_delay_factor(1.0),
user_activity_screen_dim_delay_factor(1.0) {}
// static
@@ -101,9 +101,9 @@ std::string PowerPolicyController::GetPolicyDebugString(
str += base::StringPrintf("use_audio=%d ", policy.use_audio_activity());
if (policy.has_use_video_activity())
str += base::StringPrintf("use_video=%d ", policy.use_audio_activity());
- if (policy.has_presentation_idle_delay_factor()) {
- str += base::StringPrintf("presentation_idle_delay_factor=%f ",
- policy.presentation_idle_delay_factor());
+ if (policy.has_presentation_screen_dim_delay_factor()) {
+ str += base::StringPrintf("presentation_screen_dim_delay_factor=%f ",
+ policy.presentation_screen_dim_delay_factor());
}
if (policy.has_user_activity_screen_dim_delay_factor()) {
str += base::StringPrintf("user_activity_screen_dim_delay_factor=%f ",
@@ -174,8 +174,8 @@ void PowerPolicyController::ApplyPrefs(const PrefValues& values) {
prefs_policy_.set_lid_closed_action(GetProtoAction(values.lid_closed_action));
prefs_policy_.set_use_audio_activity(values.use_audio_activity);
prefs_policy_.set_use_video_activity(values.use_video_activity);
- prefs_policy_.set_presentation_idle_delay_factor(
- values.presentation_idle_delay_factor);
+ prefs_policy_.set_presentation_screen_dim_delay_factor(
+ values.presentation_screen_dim_delay_factor);
prefs_policy_.set_user_activity_screen_dim_delay_factor(
values.user_activity_screen_dim_delay_factor);
diff --git a/chromeos/dbus/power_policy_controller.h b/chromeos/dbus/power_policy_controller.h
index ce5ed05..a2735a1 100644
--- a/chromeos/dbus/power_policy_controller.h
+++ b/chromeos/dbus/power_policy_controller.h
@@ -53,7 +53,7 @@ class CHROMEOS_EXPORT PowerPolicyController
bool use_video_activity;
bool allow_screen_wake_locks;
bool enable_screen_lock;
- double presentation_idle_delay_factor;
+ double presentation_screen_dim_delay_factor;
double user_activity_screen_dim_delay_factor;
};
@@ -65,7 +65,7 @@ class CHROMEOS_EXPORT PowerPolicyController
// screen being locked. Used if the |enable_screen_lock| pref is set but
// |*_screen_lock_delay_ms| are unset or set to higher values than what
// this constant would imply.
- const static int kScreenLockAfterOffDelayMs;
+ static const int kScreenLockAfterOffDelayMs;
PowerPolicyController(DBusThreadManager* manager, PowerManagerClient* client);
virtual ~PowerPolicyController();
diff --git a/chromeos/dbus/power_policy_controller_unittest.cc b/chromeos/dbus/power_policy_controller_unittest.cc
index fe3601ef..b3b2564 100644
--- a/chromeos/dbus/power_policy_controller_unittest.cc
+++ b/chromeos/dbus/power_policy_controller_unittest.cc
@@ -53,7 +53,7 @@ TEST_F(PowerPolicyControllerTest, Prefs) {
prefs.use_audio_activity = true;
prefs.use_video_activity = true;
prefs.enable_screen_lock = false;
- prefs.presentation_idle_delay_factor = 3.0;
+ prefs.presentation_screen_dim_delay_factor = 3.0;
prefs.user_activity_screen_dim_delay_factor = 2.0;
policy_controller_->ApplyPrefs(prefs);
@@ -74,7 +74,7 @@ TEST_F(PowerPolicyControllerTest, Prefs) {
power_manager::PowerManagementPolicy_Action_SHUT_DOWN);
expected_policy.set_use_audio_activity(true);
expected_policy.set_use_video_activity(true);
- expected_policy.set_presentation_idle_delay_factor(3.0);
+ expected_policy.set_presentation_screen_dim_delay_factor(3.0);
expected_policy.set_user_activity_screen_dim_delay_factor(2.0);
expected_policy.set_reason("Prefs");
EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
generated by cgit v1.1 at 2025-03-12 20:27:35 +0000