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

ash/system/tray/system_tray_bubble.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_bubble.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "base/message_loop.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ skipping 242 matching lines @@
 void SystemTrayBubbleView::SetBubbleBorder(views::BubbleBorder* border) {
   GetBubbleFrameView()->SetBubbleBorder(border);
 }
 
 void SystemTrayBubbleView::UpdateAnchor() {
   SizeToContents();
   GetWidget()->GetRootView()->SchedulePaint();
 }
 
 void SystemTrayBubbleView::Init() {
-  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 1, 1, 1));
+  views::BoxLayout* layout =
+      new views::BoxLayout(views::BoxLayout::kVertical, 1, 1, 1);
+  layout->set_spread_blank_space(true);
+  SetLayoutManager(layout);
   set_background(new SystemTrayBubbleBackground(this));
 }
 
 gfx::Rect SystemTrayBubbleView::GetAnchorRect() {
   gfx::Rect rect;
   if (host_)
     rect = host_->GetAnchorRect();
   if (rect.IsEmpty()) {
     rect = gfx::Screen::GetPrimaryMonitor().bounds();
     rect = gfx::Rect(base::i18n::IsRTL() ? kPaddingFromRightEdgeOfScreen :
@@ skipping 59 matching lines @@
   // Reset the host pointer in bubble_view_ in case its destruction is deferred.
   if (bubble_view_)
     bubble_view_->reset_host();
   if (bubble_widget_) {
     bubble_widget_->RemoveObserver(this);
     // This triggers the destruction of bubble_view_.
     bubble_widget_->Close();
   }
 }
 
+void SystemTrayBubble::UpdateView(
+    const std::vector<ash::SystemTrayItem*>& items,
+    BubbleType bubble_type) {
+  DestroyItemViews();
+  bubble_view_->RemoveAllChildViews(true);
+
+  items_ = items;
+  bubble_type_ = bubble_type;
+  CreateItemViews(Shell::GetInstance()->tray_delegate()->GetUserLoginStatus());
+  bubble_widget_->GetContentsView()->Layout();
+}
+
 void SystemTrayBubble::InitView(views::View* anchor,
                                 AnchorType anchor_type,
                                 bool can_activate,
                                 ash::user::LoginStatus login_status) {
   DCHECK(bubble_view_ == NULL);
   anchor_type_ = anchor_type;
   bubble_view_ = new SystemTrayBubbleView(anchor, this, can_activate);
 
-  for (std::vector<ash::SystemTrayItem*>::iterator it = items_.begin();
-       it != items_.end();
-       ++it) {
-    views::View* view = NULL;
-    switch (bubble_type_) {
-      case BUBBLE_TYPE_DEFAULT:
-        view = (*it)->CreateDefaultView(login_status);
-        break;
-      case BUBBLE_TYPE_DETAILED:
-        view = (*it)->CreateDetailedView(login_status);
-        break;
-      case BUBBLE_TYPE_NOTIFICATION:
-        view = (*it)->CreateNotificationView(login_status);
-        break;
-    }
-    if (view)
-      bubble_view_->AddChildView(new TrayPopupItemContainer(view));
-  }
+  CreateItemViews(login_status);
 
   DCHECK(bubble_widget_ == NULL);
   bubble_widget_ = views::BubbleDelegateView::CreateBubble(bubble_view_);
 
   // Must occur after call to CreateBubble()
   bubble_view_->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble_widget_->non_client_view()->frame_view()->set_background(NULL);
   SystemTrayBubbleBorder::ArrowType arrow_type;
   if (anchor_type_ == ANCHOR_TYPE_TRAY)
     arrow_type = SystemTrayBubbleBorder::ARROW_TYPE_BOTTOM;
@@ skipping 75 matching lines @@
 void SystemTrayBubble::RestartAutoCloseTimer() {
   if (autoclose_delay_)
     StartAutoCloseTimer(autoclose_delay_);
 }
 
 void SystemTrayBubble::Close() {
   if (bubble_widget_)
     bubble_widget_->Close();
 }
 
+void SystemTrayBubble::CreateItemViews(user::LoginStatus login_status) {
+  for (std::vector<ash::SystemTrayItem*>::iterator it = items_.begin();
+       it != items_.end();
+       ++it) {
+    views::View* view = NULL;
+    switch (bubble_type_) {
+      case BUBBLE_TYPE_DEFAULT:
+        view = (*it)->CreateDefaultView(login_status);
+        break;
+      case BUBBLE_TYPE_DETAILED:
+        view = (*it)->CreateDetailedView(login_status);
+        break;
+      case BUBBLE_TYPE_NOTIFICATION:
+        view = (*it)->CreateNotificationView(login_status);
+        break;
+    }
+    if (view)
+      bubble_view_->AddChildView(new TrayPopupItemContainer(view));
+  }
+}
+
 base::EventStatus SystemTrayBubble::WillProcessEvent(
     const base::NativeEvent& event) {
   // Check if the user clicked outside of the bubble and close it if they did.
   if (bubble_type_ != BUBBLE_TYPE_NOTIFICATION &&
       ui::EventTypeFromNative(event) == ui::ET_MOUSE_PRESSED) {
     gfx::Point cursor_in_view = ui::EventLocationFromNative(event);
     views::View::ConvertPointFromScreen(bubble_view_, &cursor_in_view);
     if (!bubble_view_->HitTest(cursor_in_view)) {
       bubble_widget_->Close();
     }
@@ skipping 14 matching lines @@
 void SystemTrayBubble::OnWidgetVisibilityChanged(views::Widget* widget,
                                                  bool visible) {
   if (!visible)
     MessageLoopForUI::current()->RemoveObserver(this);
   else
     MessageLoopForUI::current()->AddObserver(this);
 }
 
 }  // namespace internal
 }  // namespace ash