Add battery status to settings row in uber tray bubble.

ash/system/power/tray_power.h

 // 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.
 
 #ifndef ASH_SYSTEM_POWER_TRAY_POWER_H_
 #define ASH_SYSTEM_POWER_TRAY_POWER_H_
 #pragma once
 
 #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 {
 
 namespace tray {
 class PowerNotificationView;
 class PowerTrayView;
 }
 
+enum IconSet {
+  ICON_LIGHT,
+  ICON_DARK
+};
+
 class TrayPower : public SystemTrayItem,
                   public PowerStatusObserver {
  public:
   TrayPower();
   virtual ~TrayPower();
 
  private:
   enum NotificationState {
     NOTIFICATION_NONE,
     NOTIFICATION_LOW_POWER,
@@ skipping 16 matching lines @@
   // Sets |notification_state_|. Returns true if a notification should be shown.
   bool UpdateNotificationState(const PowerSupplyStatus& status);
 
   tray::PowerTrayView* power_tray_;
   tray::PowerNotificationView* notification_view_;
   NotificationState notification_state_;
 
   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
 
 #endif  // ASH_SYSTEM_POWER_TRAY_POWER_H_