Add battery status to settings row in uber tray bubble.

ash/system/power/tray_power.h

Index: ash/system/power/tray_power.h
diff --git a/ash/system/power/tray_power.h b/ash/system/power/tray_power.h
index 864d14e9d5f4c6f36261e97b6e86da7ff96aa0dc..78499b6cf09e099bf79b9cb6823a59a91963c45d 100644
--- a/ash/system/power/tray_power.h
+++ b/ash/system/power/tray_power.h
@@ -9,6 +9,12 @@
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/tray/system_tray_item.h"
 
+class SkBitmap;
+
+namespace gfx {
+class ImageSkia;
+}
+
 namespace ash {
 namespace internal {
 
@@ -17,6 +23,11 @@ class PowerNotificationView;
 class PowerTrayView;
 }
 
+enum IconSet {
+  ICON_LIGHT,
+  ICON_DARK
+};
+
 class TrayPower : public SystemTrayItem,
                   public PowerStatusObserver {
  public:
@@ -53,6 +64,9 @@ class TrayPower : public SystemTrayItem,
   DISALLOW_COPY_AND_ASSIGN(TrayPower);
 };
 
+gfx::ImageSkia GetBatteryImage(const PowerSupplyStatus& supply_status,
+                         IconSet icon_set);

[stevenjb, 2012/06/07 01:31:18]

nit: align

[stevenjb, 2012/06/07 01:31:18]

Also, this would be better as a static member function of TrayPower than a
global (even if it is namespaced - ash::internal is actually a pretty large
namespace).

[jennyz, 2012/06/07 22:06:52]

Done.

[jennyz, 2012/06/07 22:06:52]

Done.

+
 }  // namespace internal
 }  // namespace ash