| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chromeos/dbus/power_policy_controller.h" | 5 #include "chromeos/dbus/power_policy_controller.h" |
| 6 | 6 |
| 7 #include <stdint.h> |
| 8 |
| 7 #include <utility> | 9 #include <utility> |
| 8 | 10 |
| 9 #include "base/format_macros.h" | 11 #include "base/format_macros.h" |
| 10 #include "base/logging.h" | 12 #include "base/logging.h" |
| 11 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 12 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 13 | 15 |
| 14 namespace chromeos { | 16 namespace chromeos { |
| 15 | 17 |
| 16 namespace { | 18 namespace { |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 power_manager::PowerManagementPolicy::Delays* delays = | 188 power_manager::PowerManagementPolicy::Delays* delays = |
| 187 prefs_policy_.mutable_ac_delays(); | 189 prefs_policy_.mutable_ac_delays(); |
| 188 delays->set_screen_dim_ms(values.ac_screen_dim_delay_ms); | 190 delays->set_screen_dim_ms(values.ac_screen_dim_delay_ms); |
| 189 delays->set_screen_off_ms(values.ac_screen_off_delay_ms); | 191 delays->set_screen_off_ms(values.ac_screen_off_delay_ms); |
| 190 delays->set_screen_lock_ms(values.ac_screen_lock_delay_ms); | 192 delays->set_screen_lock_ms(values.ac_screen_lock_delay_ms); |
| 191 delays->set_idle_warning_ms(values.ac_idle_warning_delay_ms); | 193 delays->set_idle_warning_ms(values.ac_idle_warning_delay_ms); |
| 192 delays->set_idle_ms(values.ac_idle_delay_ms); | 194 delays->set_idle_ms(values.ac_idle_delay_ms); |
| 193 | 195 |
| 194 // If auto screen-locking is enabled, ensure that the screen is locked soon | 196 // If auto screen-locking is enabled, ensure that the screen is locked soon |
| 195 // after it's turned off due to user inactivity. | 197 // after it's turned off due to user inactivity. |
| 196 int64 lock_ms = delays->screen_off_ms() + kScreenLockAfterOffDelayMs; | 198 int64_t lock_ms = delays->screen_off_ms() + kScreenLockAfterOffDelayMs; |
| 197 if (values.enable_auto_screen_lock && delays->screen_off_ms() > 0 && | 199 if (values.enable_auto_screen_lock && delays->screen_off_ms() > 0 && |
| 198 (delays->screen_lock_ms() <= 0 || lock_ms < delays->screen_lock_ms()) && | 200 (delays->screen_lock_ms() <= 0 || lock_ms < delays->screen_lock_ms()) && |
| 199 lock_ms < delays->idle_ms()) { | 201 lock_ms < delays->idle_ms()) { |
| 200 delays->set_screen_lock_ms(lock_ms); | 202 delays->set_screen_lock_ms(lock_ms); |
| 201 } | 203 } |
| 202 | 204 |
| 203 delays = prefs_policy_.mutable_battery_delays(); | 205 delays = prefs_policy_.mutable_battery_delays(); |
| 204 delays->set_screen_dim_ms(values.battery_screen_dim_delay_ms); | 206 delays->set_screen_dim_ms(values.battery_screen_dim_delay_ms); |
| 205 delays->set_screen_off_ms(values.battery_screen_off_delay_ms); | 207 delays->set_screen_off_ms(values.battery_screen_off_delay_ms); |
| 206 delays->set_screen_lock_ms(values.battery_screen_lock_delay_ms); | 208 delays->set_screen_lock_ms(values.battery_screen_lock_delay_ms); |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 power_manager::PowerManagementPolicy_Action_DO_NOTHING); | 358 power_manager::PowerManagementPolicy_Action_DO_NOTHING); |
| 357 } | 359 } |
| 358 } | 360 } |
| 359 | 361 |
| 360 if (!causes.empty()) | 362 if (!causes.empty()) |
| 361 policy.set_reason(causes); | 363 policy.set_reason(causes); |
| 362 client_->SetPolicy(policy); | 364 client_->SetPolicy(policy); |
| 363 } | 365 } |
| 364 | 366 |
| 365 } // namespace chromeos | 367 } // namespace chromeos |
| OLD | NEW |