Add battery status to settings row in uber tray bubble.

ash/system/settings/tray_settings.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_SETTINGS_TRAY_SETTINGS_H_
 #define ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_
 #pragma once
 
+#include "ash/system/power/power_status_observer.h"
 #include "ash/system/tray/system_tray_item.h"
 
 namespace ash {
 namespace internal {
 
-class TraySettings : public SystemTrayItem {
+namespace tray {
+class SettingsDefaultView;
+}
+
+class TraySettings : public SystemTrayItem,
+                     public PowerStatusObserver {
  public:
   TraySettings();
   virtual ~TraySettings();
 
  private:
   // Overridden from SystemTrayItem
   virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
   virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
   virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
   virtual void DestroyTrayView() OVERRIDE;
   virtual void DestroyDefaultView() OVERRIDE;
   virtual void DestroyDetailedView() OVERRIDE;
   virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
 
+  // Overridden from PowerStatusObserver.
+  virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE;
+
+  tray::SettingsDefaultView* default_;

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

nit: default_view_?

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

Done.

+
   DISALLOW_COPY_AND_ASSIGN(TraySettings);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_