Add NetworkNotificationView to tray_network.

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 159 matching lines @@
       ime_observer_(NULL),
       locale_observer_(NULL),
       network_observer_(NULL),
       power_status_observer_(NULL),
       update_observer_(NULL),
       user_observer_(NULL),
       widget_(NULL),
       background_(new internal::SystemTrayBackground),
       should_show_launcher_(false),
       shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
-      ALLOW_THIS_IN_INITIALIZER_LIST(hide_background_animator_(this,
-          0, kTrayBackgroundAlpha)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(hover_background_animator_(this,
-          0, kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(hide_background_animator_(
+          this, 0, kTrayBackgroundAlpha)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(hover_background_animator_(
+          this, 0, kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha)),
+      default_bubble_height_(0) {
   tray_container_ = new internal::SystemTrayContainer;
   tray_container_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, 0));
   tray_container_->set_background(background_);
   tray_container_->set_border(
       views::Border::CreateEmptyBorder(1, 1, 1, 1));
   set_border(views::Border::CreateEmptyBorder(0, 0,
         kPaddingFromBottomOfScreenBottomAlignment,
         kPaddingFromRightEdgeOfScreenBottomAlignment));
   set_notify_enter_exit_on_child(true);
@@ skipping 122 matching lines @@
 
 void SystemTray::SetDetailedViewCloseDelay(int close_delay) {
   if (bubble_.get() &&
       bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DETAILED)
     bubble_->StartAutoCloseTimer(close_delay);
 }
 
 void SystemTray::HideDetailedView(SystemTrayItem* item) {
   if (item != detailed_item_)
     return;
-  bubble_.reset();
+  DestroyBubble();
   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);
   // 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();
+  DestroyBubble();
 
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
       it != items_.end();
       ++it) {
     (*it)->UpdateAfterLoginStatusChange(login_status);
   }
 
   SetVisible(true);
   PreferredSizeChanged();
 }
 
 bool SystemTray::CloseBubbleForTest() const {
   if (!bubble_.get())
     return false;
   bubble_->Close();
   return true;
 }
 
 // Private methods.
 
+void SystemTray::DestroyBubble() {
+  bubble_.reset();
+  detailed_item_ = NULL;
+}
+
 void SystemTray::RemoveBubble(SystemTrayBubble* bubble) {
   if (bubble == bubble_.get()) {
-    bubble_.reset();
+    DestroyBubble();
     UpdateNotificationBubble();  // State changed, re-create notifications.
     if (should_show_launcher_) {
       // No need to show the launcher if the mouse isn't over the status area
       // anymore.
       aura::RootWindow* root = GetWidget()->GetNativeView()->GetRootWindow();
       should_show_launcher_ = GetWidget()->GetWindowScreenBounds().Contains(
           root->last_mouse_location());
       if (!should_show_launcher_)
         Shell::GetInstance()->shelf()->UpdateAutoHideState();
     }
@@ skipping 69 matching lines @@
         ash::Shell::GetInstance()->tray_delegate();
     views::View* anchor = tray_container_;
     SystemTrayBubble::InitParams init_params(
         SystemTrayBubble::ANCHOR_TYPE_TRAY,
         shelf_alignment());
     init_params.anchor = anchor;
     init_params.can_activate = can_activate;
     init_params.login_status = delegate->GetUserLoginStatus();
     if (arrow_offset >= 0)
       init_params.arrow_offset = arrow_offset;
+    if (detailed)
+      init_params.max_height = default_bubble_height_;
     bubble_->InitView(init_params);
   }
+  // Save height of default view for creating detailed views directly.
+  if (!detailed)
+    default_bubble_height_ = bubble_->bubble_view()->height();
 
   if (detailed && items.size() > 0)
     detailed_item_ = items[0];
   else
     detailed_item_ = NULL;
 
   // 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.
 }
 
 void SystemTray::UpdateNotificationBubble() {
   // Only show the notification buble if we have notifications and we are not
   // showing the default bubble.
   if (notification_items_.empty() ||
       (bubble_.get() &&
        bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DEFAULT)) {
     notification_bubble_.reset();
     return;
   }
-  notification_bubble_.reset(
-      new SystemTrayBubble(this, notification_items_,
-                           SystemTrayBubble::BUBBLE_TYPE_NOTIFICATION));
+  if (bubble_.get() &&
+      bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DETAILED) {
+    // Skip notifications for any currently displayed detailed item.
+    std::vector<SystemTrayItem*> items;
+    for (std::vector<SystemTrayItem*>::iterator iter =
+             notification_items_.begin();
+         iter != notification_items_.end(); ++ iter) {
+      if (*iter != detailed_item_)
+        items.push_back(*iter);
+    }
+    notification_bubble_.reset(new SystemTrayBubble(
+        this, items, SystemTrayBubble::BUBBLE_TYPE_NOTIFICATION));
+  } else {
+    // Show all notifications.
+    notification_bubble_.reset(new SystemTrayBubble(
+        this, notification_items_, SystemTrayBubble::BUBBLE_TYPE_NOTIFICATION));
+  }
   views::View* anchor;
   SystemTrayBubble::AnchorType anchor_type;
   if (bubble_.get()) {
     anchor = bubble_->bubble_view();
     anchor_type = SystemTrayBubble::ANCHOR_TYPE_BUBBLE;
   } else {
     anchor = tray_container_;
     anchor_type = SystemTrayBubble::ANCHOR_TYPE_TRAY;
   }
   SystemTrayBubble::InitParams init_params(anchor_type, shelf_alignment());
@@ skipping 79 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