diff options
Diffstat (limited to 'chromeos/dbus')
| -rw-r--r-- | chromeos/dbus/power_manager_client.cc | 4 | ||||
| -rw-r--r-- | chromeos/dbus/power_supply_status.cc | 8 | ||||
| -rw-r--r-- | chromeos/dbus/power_supply_status.h | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc index addc5b8..26f6705 100644 --- a/chromeos/dbus/power_manager_client.cc +++ b/chromeos/dbus/power_manager_client.cc @@ -353,6 +353,10 @@ class PowerManagerClientImpl : public PowerManagerClient { status.line_power_on = protobuf.line_power_on(); status.battery_seconds_to_empty = protobuf.battery_time_to_empty(); status.battery_seconds_to_full = protobuf.battery_time_to_full(); + status.averaged_battery_time_to_empty = + protobuf.averaged_battery_time_to_empty(); + status.averaged_battery_time_to_full = + protobuf.averaged_battery_time_to_full(); status.battery_percentage = protobuf.battery_percentage(); status.battery_is_present = protobuf.battery_is_present(); status.battery_is_full = protobuf.battery_is_charged(); diff --git a/chromeos/dbus/power_supply_status.cc b/chromeos/dbus/power_supply_status.cc index a008e8a..907a55e1 100644 --- a/chromeos/dbus/power_supply_status.cc +++ b/chromeos/dbus/power_supply_status.cc @@ -15,6 +15,8 @@ PowerSupplyStatus::PowerSupplyStatus() battery_is_full(false), battery_seconds_to_empty(0), battery_seconds_to_full(0), + averaged_battery_time_to_empty(0), + averaged_battery_time_to_full(0), battery_percentage(0), is_calculating_battery_time(false) {} @@ -39,6 +41,12 @@ std::string PowerSupplyStatus::ToString() const { "battery_seconds_to_full = %"PRId64" ", battery_seconds_to_full); base::StringAppendF(&result, + "averaged_battery_time_to_empty = %"PRId64" ", + averaged_battery_time_to_empty); + base::StringAppendF(&result, + "averaged_battery_time_to_full = %"PRId64" ", + averaged_battery_time_to_full); + base::StringAppendF(&result, "is_calculating_battery_time = %s ", is_calculating_battery_time ? "true" : "false"); diff --git a/chromeos/dbus/power_supply_status.h b/chromeos/dbus/power_supply_status.h index f831de4..6a6b369 100644 --- a/chromeos/dbus/power_supply_status.h +++ b/chromeos/dbus/power_supply_status.h @@ -21,6 +21,8 @@ struct CHROMEOS_EXPORT PowerSupplyStatus { // Time in seconds until the battery is empty or full, 0 for unknown. int64 battery_seconds_to_empty; int64 battery_seconds_to_full; + int64 averaged_battery_time_to_empty; + int64 averaged_battery_time_to_full; double battery_percentage; |