Add TraySms for SMS messages.

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"
 #include "ash/system/bluetooth/tray_bluetooth.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/date/tray_date.h"
 #include "ash/system/drive/tray_drive.h"
 #include "ash/system/ime/tray_ime.h"
 #include "ash/system/network/tray_network.h"
+#include "ash/system/network/tray_sms.h"
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/power/tray_power.h"
 #include "ash/system/settings/tray_settings.h"
 #include "ash/system/tray/system_tray_bubble.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/system_tray_widget_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray_accessibility.h"
@@ skipping 138 matching lines @@
   }
 }
 
 void SystemTray::CreateItems() {
   internal::TrayVolume* tray_volume = new internal::TrayVolume();
   internal::TrayBluetooth* tray_bluetooth = new internal::TrayBluetooth();
   internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
   internal::TrayDate* tray_date = new internal::TrayDate();
   internal::TrayPower* tray_power = new internal::TrayPower();
   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::TrayUpdate* tray_update = new internal::TrayUpdate;
 
   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;
   network_observer_ = tray_network;
   power_status_observer_ = tray_power;
   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_volume);
   AddTrayItem(tray_brightness);
   AddTrayItem(tray_update);
   AddTrayItem(tray_accessibility);
   AddTrayItem(tray_caps_lock);
   AddTrayItem(new internal::TraySettings());
   AddTrayItem(tray_date);
   SetVisible(ash::Shell::GetInstance()->tray_delegate()->
@@ skipping 46 matching lines @@
 
 void SystemTray::ShowDetailedView(SystemTrayItem* item,
                                   int close_delay,
                                   bool activate) {
   std::vector<SystemTrayItem*> items;
   items.push_back(item);
   ShowItems(items, true, activate);
   bubble_->StartAutoCloseTimer(close_delay);
 }
 
+void SystemTray::SetDetailedViewCloseDelay(int close_delay) {
+  if (bubble_.get() &&
+      bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DETAILED)
+    bubble_->StartAutoCloseTimer(close_delay);
+}

[stevenjb, 2012/05/15 02:57:16]

Moved from below.

+
+void SystemTray::HideDetailedView(SystemTrayItem* item) {
+  if (item == detailed_item_) {
+    bubble_.reset();
+    UpdateNotificationBubble();
+  }
+}
+
 void SystemTray::ShowNotificationView(SystemTrayItem* item) {
   if (std::find(notification_items_.begin(), notification_items_.end(), item)
       != notification_items_.end())
     return;
   notification_items_.push_back(item);
   UpdateNotificationBubble();
 }
 
 void SystemTray::HideNotificationView(SystemTrayItem* item) {
   std::vector<SystemTrayItem*>::iterator found_iter =
       std::find(notification_items_.begin(), notification_items_.end(), item);
   if (found_iter == notification_items_.end())
     return;
   notification_items_.erase(found_iter);
-  UpdateNotificationBubble();
-}
-
-void SystemTray::SetDetailedViewCloseDelay(int close_delay) {
-  if (bubble_.get() &&
-      bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DETAILED)
-    bubble_->StartAutoCloseTimer(close_delay);
+  // Only update the notification bubble if visible (i.e. don't create one).
+  if (notification_bubble_.get())
+    UpdateNotificationBubble();
 }
 
 void SystemTray::UpdateAfterLoginStatusChange(user::LoginStatus login_status) {
   bubble_.reset();
 
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
       it != items_.end();
       ++it) {
     (*it)->UpdateAfterLoginStatusChange(login_status);
   }
@@ skipping 38 matching lines @@
 }
 
 void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items,
                            bool detailed,
                            bool can_activate) {
   // Destroy any existing bubble and create a new one.
   SystemTrayBubble::BubbleType bubble_type = detailed ?
       SystemTrayBubble::BUBBLE_TYPE_DETAILED :
       SystemTrayBubble::BUBBLE_TYPE_DEFAULT;
   bubble_.reset(new SystemTrayBubble(this, items, bubble_type));
+
+  if (detailed && items.size() > 0)
+    detailed_item_ = items[0];
+  else
+    detailed_item_ = NULL;
+
+  // Destroy the notification bubble here so that it doesn't get rebuilt
+  // while we add items to the main bubble_ (e.g. in HideNotificationView).
+  notification_bubble_.reset();
+
   ash::SystemTrayDelegate* delegate =
       ash::Shell::GetInstance()->tray_delegate();
   views::View* anchor = tray_container_;
   bubble_->InitView(anchor, SystemTrayBubble::ANCHOR_TYPE_TRAY,
                     can_activate, delegate->GetUserLoginStatus());
   // If we have focus the shelf should be visible and we need to continue
   // showing the shelf when the popup is shown.
   if (GetWidget()->IsActive())
     should_show_launcher_ = true;
   UpdateNotificationBubble();  // State changed, re-create notifications.
@@ skipping 80 matching lines @@
     canvas->DrawFocusRect(tray_container_->bounds());
 }
 
 void SystemTray::UpdateBackground(int alpha) {
   background_->set_alpha(hide_background_animator_.alpha() +
                          hover_background_animator_.alpha());
   SchedulePaint();
 }
 
 }  // namespace ash