| Index: chromeos/dbus/power_policy_controller.cc
|
| diff --git a/chromeos/dbus/power_policy_controller.cc b/chromeos/dbus/power_policy_controller.cc
|
| index 970ff117925214f962548f5fee6c25c20494c59f..40621c840423fbfeaf112ceb0c0a1e77c1f98e14 100644
|
| --- a/chromeos/dbus/power_policy_controller.cc
|
| +++ b/chromeos/dbus/power_policy_controller.cc
|
| @@ -88,7 +88,8 @@ PowerPolicyController::PrefValues::PrefValues()
|
| enable_auto_screen_lock(false),
|
| presentation_screen_dim_delay_factor(1.0),
|
| user_activity_screen_dim_delay_factor(1.0),
|
| - wait_for_initial_user_activity(false) {}
|
| + wait_for_initial_user_activity(false),
|
| + force_nonzero_brightness_for_user_activity(true) {}
|
|
|
| // static
|
| std::string PowerPolicyController::GetPolicyDebugString(
|
| @@ -128,6 +129,10 @@ std::string PowerPolicyController::GetPolicyDebugString(
|
| str += base::StringPrintf("wait_for_initial_user_activity=%d ",
|
| policy.wait_for_initial_user_activity());
|
| }
|
| + if (policy.has_force_nonzero_brightness_for_user_activity()) {
|
| + str += base::StringPrintf("force_nonzero_brightness_for_user_activity=%d ",
|
| + policy.force_nonzero_brightness_for_user_activity());
|
| + }
|
| if (policy.has_reason())
|
| str += base::StringPrintf("reason=\"%s\" ", policy.reason().c_str());
|
| base::TrimWhitespace(str, base::TRIM_TRAILING, &str);
|
| @@ -210,6 +215,8 @@ void PowerPolicyController::ApplyPrefs(const PrefValues& values) {
|
| values.user_activity_screen_dim_delay_factor);
|
| prefs_policy_.set_wait_for_initial_user_activity(
|
| values.wait_for_initial_user_activity);
|
| + prefs_policy_.set_force_nonzero_brightness_for_user_activity(
|
| + values.force_nonzero_brightness_for_user_activity);
|
|
|
| honor_screen_wake_locks_ = values.allow_screen_wake_locks;
|
|
|
|
|