Add battery status to settings row in uber tray bubble.

ash/system/tray/system_tray.cc

Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index b2b9eca423e25ef2be4ce0c3f57870460b1d6dee..65baade992cce7c04eed187bd9813b6c1e7be124 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -181,6 +181,7 @@ void SystemTray::CreateItems() {
   internal::TrayIME* tray_ime = new internal::TrayIME;
   internal::TrayLocale* tray_locale = new internal::TrayLocale;
   internal::TrayUpdate* tray_update = new internal::TrayUpdate;
+  internal::TraySettings* tray_settings = new internal::TraySettings();
 
   accessibility_observer_ = tray_accessibility;
   audio_observer_ = tray_volume;
@@ -193,6 +194,8 @@ void SystemTray::CreateItems() {
   locale_observer_ = tray_locale;
   network_observer_ = tray_network;
   power_status_observer_ = tray_power;

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

Remove this?

[sadrul, 2012/06/07 15:14:35]

A bit ugly, but a slightly different approach: make SystemTray itself a
PowerStatusObserver, and update tray_power and tray_settings from the
SystemTray::OnPowerStatusChanged callback. So you wouldn't need the change in
chromeos system-tray-delegate

Or: just have ObserverList<PowerStatusObserver> power_status_observers_, and
expose that to chromeos-system-tray-delegate. The delegate can then
FOR_EACH_OBSERVER on the list. This is probably better.

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

Done.

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

Done.

+  power_status_observers_.push_back(tray_power);
+  power_status_observers_.push_back(tray_settings);
   update_observer_ = tray_update;
   user_observer_ = tray_user;
 
@@ -209,7 +212,7 @@ void SystemTray::CreateItems() {
   AddTrayItem(tray_update);
   AddTrayItem(tray_accessibility);
   AddTrayItem(tray_caps_lock);
-  AddTrayItem(new internal::TraySettings());
+  AddTrayItem(tray_settings);
   AddTrayItem(tray_date);
   SetVisible(ash::Shell::GetInstance()->tray_delegate()->
       GetTrayVisibilityOnStartup());
@@ -298,6 +301,16 @@ void SystemTray::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   }
 }
 
+void SystemTray::NotifyPowerStatusChange(const PowerSupplyStatus& power_status)
+{

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

nit: Put arg + { on second line

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

Done.

+  for (std::vector<PowerStatusObserver*>::iterator it =
+           power_status_observers_.begin();
+       it != power_status_observers_.end();
+       ++it) {
+    (*it)->OnPowerStatusChanged(power_status);
+  }
+}
+
 bool SystemTray::CloseBubbleForTest() const {
   if (!bubble_.get())
     return false;