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

ash/system/tray/tray_views.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/tray_views.h"
 
 #include "ash/system/tray/tray_constants.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
@@ skipping 189 matching lines @@
 }
 
 FixedSizedScrollView::~FixedSizedScrollView() {}
 
 void FixedSizedScrollView::SetContentsView(View* view) {
   SetContents(view);
   view->SetBoundsRect(gfx::Rect(view->GetPreferredSize()));
 }
 
 gfx::Size FixedSizedScrollView::GetPreferredSize() {
-  return fixed_size_;
+  return fixed_size_.IsEmpty() ? GetContents()->GetPreferredSize() :
+                                 fixed_size_;
 }
 
 void FixedSizedScrollView::Layout() {
   views::View* contents = GetContents();
   gfx::Rect bounds = gfx::Rect(contents->GetPreferredSize());
   bounds.set_width(std::max(0, width() - GetScrollBarWidth()));
   contents->SetBoundsRect(bounds);
 
   views::ScrollView::Layout();
+  if (!vertical_scroll_bar()->visible()) {
+    gfx::Rect bounds = contents->bounds();
+    bounds.set_width(bounds.width() + GetScrollBarWidth());
+    contents->SetBoundsRect(bounds);
+  }
 }
 
 void FixedSizedScrollView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   views::View* contents = GetContents();
   gfx::Rect bounds = gfx::Rect(contents->GetPreferredSize());
   bounds.set_width(std::max(0, width() - GetScrollBarWidth()));
   contents->SetBoundsRect(bounds);
 }
 
 void FixedSizedScrollView::OnMouseEntered(const views::MouseEvent& event) {
@@ skipping 263 matching lines @@
 TrayNotificationView::~TrayNotificationView() {
 }
 
 void TrayNotificationView::ButtonPressed(views::Button* sender,
                                          const views::Event& event) {
   OnClose();
 }
 
 }  // namespace internal
 }  // namespace ash