ash: Make sure all the sub-popups retain the same height as the main popup.

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 232 matching lines @@
   if (tray_item) {
     tray_container_->AddChildViewAt(tray_item, 0);
     PreferredSizeChanged();
   }
 }
 
 void SystemTray::RemoveTrayItem(SystemTrayItem* item) {
   NOTIMPLEMENTED();
 }
 
-void SystemTray::ShowDefaultView() {
-  ShowItems(items_.get(), false, true);
+void SystemTray::ShowDefaultView(BubbleCreationType creation_type) {
+  ShowItems(items_.get(), false, true, creation_type);
 }
 
 void SystemTray::ShowDetailedView(SystemTrayItem* item,
                                   int close_delay,
-                                  bool activate) {
+                                  bool activate,
+                                  BubbleCreationType creation_type) {
   std::vector<SystemTrayItem*> items;
   items.push_back(item);
-  ShowItems(items, true, activate);
+  ShowItems(items, true, activate, creation_type);
   bubble_->StartAutoCloseTimer(close_delay);
 }
 
 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();
 }
@@ skipping 56 matching lines @@
 }
 
 void SystemTray::SetPaintsBackground(
       bool value,
       internal::BackgroundAnimator::ChangeType change_type) {
   hide_background_animator_.SetPaintsBackground(value, change_type);
 }
 
 void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items,
                            bool detailed,
-                           bool can_activate) {
+                           bool can_activate,
+                           BubbleCreationType creation_type) {
   // 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));
-  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 (bubble_.get() && creation_type == BUBBLE_USE_EXISTING) {
+    bubble_->UpdateView(items, bubble_type);
+  } else {
+    bubble_.reset(new SystemTrayBubble(this, items, bubble_type));
+    ash::SystemTrayDelegate* delegate =
+        ash::Shell::GetInstance()->tray_delegate();
+    bubble_->InitView(tray_container_, 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.
 }
 
 void SystemTray::UpdateNotificationBubble() {
   // Only show the notification buble if we have notifications and we are not
   // showing the default bubble.
@@ skipping 29 matching lines @@
   notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
 }
 
 bool SystemTray::PerformAction(const views::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (bubble_.get() &&
       bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DEFAULT) {
     bubble_->Close();
   } else {
-    ShowDefaultView();
+    ShowDefaultView(BUBBLE_CREATE_NEW);
   }
   return true;
 }
 
 void SystemTray::OnMouseEntered(const views::MouseEvent& event) {
   should_show_launcher_ = true;
   hover_background_animator_.SetPaintsBackground(true,
       internal::BackgroundAnimator::CHANGE_ANIMATE);
 }
 
@@ skipping 25 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