Add battery status to settings row in uber tray bubble.

ash/system/tray/system_tray.cc

 // 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.
 
 #include "ash/system/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
@@ skipping 163 matching lines @@
   internal::TrayNetwork* tray_network = new internal::TrayNetwork;
   internal::TraySms* tray_sms = new internal::TraySms();
   internal::TrayUser* tray_user = new internal::TrayUser;
   internal::TrayAccessibility* tray_accessibility =
       new internal::TrayAccessibility;
   internal::TrayCapsLock* tray_caps_lock = new internal::TrayCapsLock;
   internal::TrayDrive* tray_drive = new internal::TrayDrive;
   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;
   bluetooth_observer_ = tray_bluetooth;
   brightness_observer_ = tray_brightness;
   caps_lock_observer_ = tray_caps_lock;
   clock_observer_ = tray_date;
   drive_observer_ = tray_drive;
   ime_observer_ = tray_ime;
   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;
 
   AddTrayItem(tray_user);
   AddTrayItem(tray_power);
   AddTrayItem(tray_network);
   AddTrayItem(tray_bluetooth);
   AddTrayItem(tray_sms);
   AddTrayItem(tray_drive);
   AddTrayItem(tray_ime);
   AddTrayItem(tray_locale);
   AddTrayItem(tray_volume);
   AddTrayItem(tray_brightness);
   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());
 }
 
 void SystemTray::AddTrayItem(SystemTrayItem* item) {
   items_.push_back(item);
 
   SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
   views::View* tray_item = item->CreateTrayView(delegate->GetUserLoginStatus());
@@ skipping 68 matching lines @@
 }
 
 void SystemTray::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
       it != items_.end();
       ++it) {
     (*it)->UpdateAfterShelfAlignmentChange(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;
   bubble_->Close();
   return true;
 }
 
 // Private methods.
 
 void SystemTray::DestroyBubble() {
@@ skipping 238 matching lines @@
 
 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // The tray itself expands to the right and bottom edge of the screen to make
   // sure clicking on the edges brings up the popup. However, the focus border
   // should be only around the container.
   if (GetWidget() && GetWidget()->IsActive())
     canvas->DrawFocusRect(tray_container_->bounds());
 }
 
 }  // namespace ash