Limit constrained windows to the size of the parent view.

chrome/browser/ui/views/constrained_window_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 "chrome/browser/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 552 matching lines @@
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     title_font_ = &rb.GetFont(ui::ResourceBundle::MediumFont);
 #endif
     initialized = true;
   }
 }
 
 void UpdateWebContentsModalDialogPosition(
     views::Widget* widget,
     web_modal::WebContentsModalDialogHost* dialog_host) {
-  gfx::Size size = widget->GetWindowBoundsInScreen().size();
-  gfx::Point position = dialog_host->GetDialogPosition(size);
+  gfx::Size size = widget->GetRootView()->GetPreferredSize();
   views::Border* border =
       widget->non_client_view()->frame_view()->border();
+  gfx::Size max_size = dialog_host->GetMaximumDialogSize();
+  // Enlarge the max size by the top border, as the dialog will be shifted
+  // outside the area specified by the dialog host by this amount later in the
+  // function.
   // Border may be null during widget initialization.
+  if (border)
+    max_size.Enlarge(0, border->GetInsets().top());
+  size.SetToMin(max_size);
+
+  gfx::Point position = dialog_host->GetDialogPosition(size);
   if (border) {
     // Align the first row of pixels inside the border. This is the apparent
     // top of the dialog.
     position.set_y(position.y() - border->GetInsets().top());
   }
 
   if (widget->is_top_level()) {
     position +=
         views::Widget::GetWidgetForNativeView(dialog_host->GetHostView())->
             GetClientAreaBoundsInScreen().OffsetFromOrigin();
@@ skipping 38 matching lines @@
 #if defined(USE_ASH)
   ash::CustomFrameViewAsh* frame = new ash::CustomFrameViewAsh;
   frame->Init(widget);
   // Always use "active" look.
   frame->SetInactiveRenderingDisabled(true);
   return frame;
 #endif
   return new ConstrainedWindowFrameView(widget,
                                         browser_context->IsOffTheRecord());
 }