Limit constrained windows to the size of the parent view.

ui/views/bubble/bubble_frame_view.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 "ui/views/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
@@ skipping 150 matching lines @@
 gfx::Insets BubbleFrameView::GetInsets() const {
   gfx::Insets insets = content_margins_;
   const int title_height = title_->text().empty() ? 0 :
       title_->GetPreferredSize().height() + kTitleTopInset + kTitleBottomInset;
   const int close_height = close_->visible() ? close_->height() : 0;
   insets += gfx::Insets(std::max(title_height, close_height), 0, 0, 0);
   return insets;
 }
 
 gfx::Size BubbleFrameView::GetPreferredSize() {
-  const gfx::Size client(GetWidget()->client_view()->GetPreferredSize());
-  gfx::Size size(GetUpdatedWindowBounds(gfx::Rect(), client, false).size());
+  return GetSizeForClientSize(GetWidget()->client_view()->GetPreferredSize());
+}
+
+gfx::Size BubbleFrameView::GetMinimumSize() {
+  return GetSizeForClientSize(GetWidget()->client_view()->GetMinimumSize());
+}
+
+gfx::Size BubbleFrameView::GetSizeForClientSize(const gfx::Size& client_size) {

[msw, 2013/08/23 19:57:25]

nit: Move this function to match the declaration order.

[Rune Fevang, 2013/08/23 20:17:45]

Done.

+  gfx::Size size(
+      GetUpdatedWindowBounds(gfx::Rect(), client_size, false).size());
   // Accommodate the width of the title bar elements.
   int title_bar_width = GetInsets().width() + border()->GetInsets().width();
   if (!title_->text().empty())
     title_bar_width += kTitleLeftInset + title_->GetPreferredSize().width();
   if (close_->visible())
     title_bar_width += close_->width() + 1;
   if (titlebar_extra_view_ != NULL)
     title_bar_width += titlebar_extra_view_->GetPreferredSize().width();
   size.SetToMax(gfx::Size(title_bar_width, 0));
   return size;
@@ skipping 145 matching lines @@
   // |offscreen_adjust|, e.g. positive |offscreen_adjust| means bubble
   // window needs to be moved to the right and that means we need to move arrow
   // to the left, and that means negative offset.
   bubble_border_->set_arrow_offset(
       bubble_border_->GetArrowOffset(window_bounds.size()) - offscreen_adjust);
   if (offscreen_adjust)
     SchedulePaint();
 }
 
 }  // namespace views