OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/power/power_prefs.h" | 5 #include "chrome/browser/chromeos/power/power_prefs.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 values.allow_screen_wake_locks = | 154 values.allow_screen_wake_locks = |
155 prefs->GetBoolean(prefs::kPowerAllowScreenWakeLocks); | 155 prefs->GetBoolean(prefs::kPowerAllowScreenWakeLocks); |
156 values.enable_auto_screen_lock = | 156 values.enable_auto_screen_lock = |
157 prefs->GetBoolean(prefs::kEnableAutoScreenLock); | 157 prefs->GetBoolean(prefs::kEnableAutoScreenLock); |
158 values.presentation_screen_dim_delay_factor = | 158 values.presentation_screen_dim_delay_factor = |
159 prefs->GetDouble(prefs::kPowerPresentationScreenDimDelayFactor); | 159 prefs->GetDouble(prefs::kPowerPresentationScreenDimDelayFactor); |
160 values.user_activity_screen_dim_delay_factor = | 160 values.user_activity_screen_dim_delay_factor = |
161 prefs->GetDouble(prefs::kPowerUserActivityScreenDimDelayFactor); | 161 prefs->GetDouble(prefs::kPowerUserActivityScreenDimDelayFactor); |
162 values.wait_for_initial_user_activity = | 162 values.wait_for_initial_user_activity = |
163 prefs->GetBoolean(prefs::kPowerWaitForInitialUserActivity); | 163 prefs->GetBoolean(prefs::kPowerWaitForInitialUserActivity); |
| 164 values.force_nonzero_brightness_for_user_activity = |
| 165 prefs->GetBoolean(prefs::kPowerForceNonzeroBrightnessForUserActivity); |
164 | 166 |
165 power_policy_controller_->ApplyPrefs(values); | 167 power_policy_controller_->ApplyPrefs(values); |
166 } | 168 } |
167 | 169 |
168 // static | 170 // static |
169 void PowerPrefs::RegisterProfilePrefs( | 171 void PowerPrefs::RegisterProfilePrefs( |
170 user_prefs::PrefRegistrySyncable* registry) { | 172 user_prefs::PrefRegistrySyncable* registry) { |
171 registry->RegisterIntegerPref( | 173 registry->RegisterIntegerPref( |
172 prefs::kPowerAcScreenDimDelayMs, | 174 prefs::kPowerAcScreenDimDelayMs, |
173 420000, | 175 420000, |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 2.0, | 243 2.0, |
242 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 244 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
243 registry->RegisterDoublePref( | 245 registry->RegisterDoublePref( |
244 prefs::kPowerUserActivityScreenDimDelayFactor, | 246 prefs::kPowerUserActivityScreenDimDelayFactor, |
245 2.0, | 247 2.0, |
246 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 248 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
247 registry->RegisterBooleanPref( | 249 registry->RegisterBooleanPref( |
248 prefs::kPowerWaitForInitialUserActivity, | 250 prefs::kPowerWaitForInitialUserActivity, |
249 false, | 251 false, |
250 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 252 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 253 registry->RegisterBooleanPref( |
| 254 prefs::kPowerForceNonzeroBrightnessForUserActivity, |
| 255 true, |
| 256 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
251 } | 257 } |
252 | 258 |
253 void PowerPrefs::SetProfile(Profile* profile) { | 259 void PowerPrefs::SetProfile(Profile* profile) { |
254 // No need to reapply policy if profile hasn't changed, e.g. when adding a | 260 // No need to reapply policy if profile hasn't changed, e.g. when adding a |
255 // secondary user to an existing session. | 261 // secondary user to an existing session. |
256 if (profile == profile_) | 262 if (profile == profile_) |
257 return; | 263 return; |
258 | 264 |
259 profile_ = profile; | 265 profile_ = profile; |
260 pref_change_registrar_.reset(); | 266 pref_change_registrar_.reset(); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 pref_change_registrar_->Add(prefs::kPowerUseVideoActivity, update_callback); | 300 pref_change_registrar_->Add(prefs::kPowerUseVideoActivity, update_callback); |
295 pref_change_registrar_->Add(prefs::kPowerAllowScreenWakeLocks, | 301 pref_change_registrar_->Add(prefs::kPowerAllowScreenWakeLocks, |
296 update_callback); | 302 update_callback); |
297 pref_change_registrar_->Add(prefs::kEnableAutoScreenLock, update_callback); | 303 pref_change_registrar_->Add(prefs::kEnableAutoScreenLock, update_callback); |
298 pref_change_registrar_->Add(prefs::kPowerPresentationScreenDimDelayFactor, | 304 pref_change_registrar_->Add(prefs::kPowerPresentationScreenDimDelayFactor, |
299 update_callback); | 305 update_callback); |
300 pref_change_registrar_->Add(prefs::kPowerUserActivityScreenDimDelayFactor, | 306 pref_change_registrar_->Add(prefs::kPowerUserActivityScreenDimDelayFactor, |
301 update_callback); | 307 update_callback); |
302 pref_change_registrar_->Add(prefs::kPowerWaitForInitialUserActivity, | 308 pref_change_registrar_->Add(prefs::kPowerWaitForInitialUserActivity, |
303 update_callback); | 309 update_callback); |
| 310 pref_change_registrar_->Add( |
| 311 prefs::kPowerForceNonzeroBrightnessForUserActivity, update_callback); |
304 | 312 |
305 UpdatePowerPolicyFromPrefs(); | 313 UpdatePowerPolicyFromPrefs(); |
306 } | 314 } |
307 | 315 |
308 } // namespace chromeos | 316 } // namespace chromeos |
OLD | NEW |