chromeos: Refactor system tray code into PowerStatus.

chromeos/dbus/power_manager_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/power_manager_client.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 786 matching lines @@
       const power_manager::PowerManagementPolicy& policy) OVERRIDE {}
   virtual void SetIsProjecting(bool is_projecting) OVERRIDE {}
   virtual base::Closure GetSuspendReadinessCallback() OVERRIDE {
     return base::Closure();
   }
 
  private:
   void UpdateStatus() {
     if (pause_count_ > 0) {
       pause_count_--;
+      if (pause_count_ == 2)

[Daniel Erat, 2013/06/28 21:43:24]

The old code was switching immediately to discharging/charging after hitting
100/0, resulting in the "full" state never actually being shown.

+        discharging_ = !discharging_;
     } else {
-      int discharge_amt = battery_percentage_ <= 10 ? 1 : 10;
-      battery_percentage_ += (discharging_ ? -discharge_amt : discharge_amt);
+      if (discharging_)
+        battery_percentage_ -= (battery_percentage_ <= 10 ? 1 : 10);
+      else
+        battery_percentage_ += (battery_percentage_ >= 10 ? 10 : 1);

[Daniel Erat, 2013/06/28 21:43:24]

The discontinuity in the old code was bugging me: it'd go 100, 90, 80, ... 10,
9, 8, ... 2, 1, 2, ... 8, 9, 10, 11, 21, 31, etc. This makes us use multiples of
10 on the way up as well.

       battery_percentage_ = std::min(std::max(battery_percentage_, 0), 100);
       // We pause at 0 and 100% so that it's easier to check those conditions.
       if (battery_percentage_ == 0 || battery_percentage_ == 100) {
-        discharging_ = !discharging_;
         pause_count_ = 4;
         if (battery_percentage_ == 100)
           cycle_count_ = (cycle_count_ + 1) % 3;
       }
     }
-    const int kSecondsToEmptyFullBattery(3 * 60 * 60);  // 3 hours.
+    const int kSecondsToEmptyFullBattery = 3 * 60 * 60;  // 3 hours.
 
     status_.is_calculating_battery_time = (pause_count_ > 1);
     status_.line_power_on = !discharging_;
     status_.battery_is_present = true;
     status_.battery_percentage = battery_percentage_;
+    status_.battery_is_full = battery_percentage_ == 100 && !discharging_;
     if (cycle_count_ != 2) {
       status_.battery_state = discharging_ ?
           PowerSupplyStatus::DISCHARGING : PowerSupplyStatus::CHARGING;
     } else {
       status_.battery_state = PowerSupplyStatus::CONNECTED_TO_USB;
     }
 
     int64 remaining_battery_time =
         std::max(1, battery_percentage_ * kSecondsToEmptyFullBattery / 100);
     status_.battery_seconds_to_empty =
@@ skipping 41 matching lines @@
 PowerManagerClient* PowerManagerClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new PowerManagerClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new PowerManagerClientStubImpl();
 }
 
 }  // namespace chromeos