Index: chrome/browser/chromeos/power/power_prefs.cc |
diff --git a/chrome/browser/chromeos/power/power_prefs.cc b/chrome/browser/chromeos/power/power_prefs.cc |
index b2e0782309090f894c8e44fe0e97c5b0ee52aaf7..9b7b8643d653b4cb315937d8ec9522292e998733 100644 |
--- a/chrome/browser/chromeos/power/power_prefs.cc |
+++ b/chrome/browser/chromeos/power/power_prefs.cc |
@@ -161,6 +161,8 @@ void PowerPrefs::UpdatePowerPolicyFromPrefs() { |
prefs->GetDouble(prefs::kPowerUserActivityScreenDimDelayFactor); |
values.wait_for_initial_user_activity = |
prefs->GetBoolean(prefs::kPowerWaitForInitialUserActivity); |
+ values.force_nonzero_brightness_for_user_activity = |
+ prefs->GetBoolean(prefs::kPowerForceNonzeroBrightnessForUserActivity); |
power_policy_controller_->ApplyPrefs(values); |
} |
@@ -248,6 +250,10 @@ void PowerPrefs::RegisterProfilePrefs( |
prefs::kPowerWaitForInitialUserActivity, |
false, |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry->RegisterBooleanPref( |
+ prefs::kPowerForceNonzeroBrightnessForUserActivity, |
+ true, |
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
} |
void PowerPrefs::SetProfile(Profile* profile) { |
@@ -301,6 +307,8 @@ void PowerPrefs::SetProfile(Profile* profile) { |
update_callback); |
pref_change_registrar_->Add(prefs::kPowerWaitForInitialUserActivity, |
update_callback); |
+ pref_change_registrar_->Add( |
+ prefs::kPowerForceNonzeroBrightnessForUserActivity, update_callback); |
UpdatePowerPolicyFromPrefs(); |
} |