Add battery status to settings row in uber tray bubble.

ash/system/tray/system_tray.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_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #pragma once
 
 #include "ash/ash_export.h"
+#include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/shelf_auto_hide_behavior.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/view.h"
 
@@ skipping 69 matching lines @@
 
   // Hides the notification view for |item|.
   void HideNotificationView(SystemTrayItem* item);
 
   // Updates the items when the login status of the system changes.
   void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
 
   // Updates the items when the shelf alignment changes.
   void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment);
 
+  void NotifyPowerStatusChange(const PowerSupplyStatus& power_status);
+
   // Returns true if the launcher should show.
   bool should_show_launcher() const {
     return bubble_.get() && should_show_launcher_;
   }
 
   AccessibilityObserver* accessibility_observer() const {
     return accessibility_observer_;
   }
   AudioObserver* audio_observer() const {
     return audio_observer_;
@@ skipping 106 matching lines @@
   AudioObserver* audio_observer_;
   BluetoothObserver* bluetooth_observer_;
   BrightnessObserver* brightness_observer_;
   CapsLockObserver* caps_lock_observer_;
   ClockObserver* clock_observer_;
   DriveObserver* drive_observer_;
   IMEObserver* ime_observer_;
   LocaleObserver* locale_observer_;
   NetworkObserver* network_observer_;
   PowerStatusObserver* power_status_observer_;
+  std::vector<PowerStatusObserver*> power_status_observers_;

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

Do we need both power_status_observer_ and power_status_observers_?
Also, for consistency with other code, I think we probably want to use
ObserverList and FOR_EACH_OBSERVER.

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

Done.

   UpdateObserver* update_observer_;
   UserObserver* user_observer_;
 
   // Bubble for default and detailed views.
   scoped_ptr<internal::SystemTrayBubble> bubble_;
 
   // Buble for notifications.
   scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
 
   // See description agove getter.
   bool should_show_launcher_;
 
   // Shelf alignment.
   ShelfAlignment shelf_alignment_;
 
   scoped_ptr<internal::SystemTrayLayerAnimationObserver>
       layer_animation_observer_;
 
   // Keep track of the default view height so that when we create detailed
   // views directly (e.g. from a notification) we know what height to use.
   int default_bubble_height_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_