Created min size for print preview dialog and modified to allow the

components/constrained_window/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 "components/constrained_window/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "components/constrained_window/constrained_window_views_client.h"
 #include "components/guest_view/browser/guest_view_base.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "ui/views/border.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_delegate.h"
 
 using web_modal::ModalDialogHost;
 using web_modal::ModalDialogHostObserver;
 
 namespace constrained_window {
+
+const char kHasIndependentBoundsKey[] = "__INDEPENDENT_BOUNDS__";

[Mike Wittman, 2016/08/05 16:03:46]

If I understood Scott correctly in the off-review discussion, this should go in
wm. If there's a DEPS violation accessing it here, we can update the
constrained_window component's DEPS.

[rbpotter, 2016/08/12 16:36:07]

Done.

+
 namespace {
 
 ConstrainedWindowViewsClient* constrained_window_views_client = NULL;
 
 // The name of a key to store on the window handle to associate
 // WidgetModalDialogHostObserverViews with the Widget.
 const char* const kWidgetModalDialogHostObserverViewsKey =
     "__WIDGET_MODAL_DIALOG_HOST_OBSERVER_VIEWS__";
 
 // Applies positioning changes from the ModalDialogHost to the Widget.
@@ skipping 49 matching lines @@
     return;
 
   gfx::Point position = dialog_host->GetDialogPosition(size);
   views::Border* border = widget->non_client_view()->frame_view()->border();
   // Border may be null during widget initialization.
   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();
+  } else {
+    bool * independent_bounds = NULL;
+    independent_bounds = reinterpret_cast<bool*>(

[Mike Wittman, 2016/08/05 16:03:46]

static_cast<> is preferred when casting from void* to typed pointers, since it's
a stricter cast.

[rbpotter, 2016/08/12 16:36:07]

Done.

+        widget->GetNativeWindowProperty(kHasIndependentBoundsKey));
+    if (independent_bounds && *independent_bounds) {
+      gfx::Rect bound =
+          views::Widget::GetWidgetForNativeView(dialog_host->GetHostView())->
+          GetClientAreaBoundsInScreen();
+      if (bound.width() - border->GetInsets().left() < size.width()) {
+        position.set_x(position.x() + (size.width()-bound.width())/2 +
+            border->GetInsets().left());
+      }
+    }
   }
-
   widget->SetBounds(gfx::Rect(position, size));
 }
 
 }  // namespace
 
 // static
 void SetConstrainedWindowViewsClient(
     std::unique_ptr<ConstrainedWindowViewsClient> new_client) {
   delete constrained_window_views_client;
   constrained_window_views_client = new_client.release();
 }
 
 void UpdateWebContentsModalDialogPosition(
     views::Widget* widget,
     web_modal::WebContentsModalDialogHost* dialog_host) {
   gfx::Size size = widget->GetRootView()->GetPreferredSize();
   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.
   views::Border* border =
       widget->non_client_view()->frame_view()->border();
   // Border may be null during widget initialization.
   if (border)
     max_size.Enlarge(0, border->GetInsets().top());
-  size.SetToMin(max_size);
+  bool * independent_bounds = NULL;
+  independent_bounds = reinterpret_cast<bool*>(
+        widget->GetNativeWindowProperty(kHasIndependentBoundsKey));
+  if (!(independent_bounds && *independent_bounds)) {
+    size.SetToMin(max_size);
+  }
   UpdateModalDialogPosition(widget, dialog_host, size);
 }
 
 void UpdateWidgetModalDialogPosition(views::Widget* widget,
                                      web_modal::ModalDialogHost* dialog_host) {
   UpdateModalDialogPosition(widget, dialog_host,
                             widget->GetRootView()->GetPreferredSize());
 }
 
 views::Widget* ShowWebModalDialogViews(
     views::WidgetDelegate* dialog,
     content::WebContents* initiator_web_contents) {
   DCHECK(constrained_window_views_client);
   // For embedded WebContents, use the embedder's WebContents for constrained
   // window.
   content::WebContents* web_contents =
       guest_view::GuestViewBase::GetTopLevelWebContents(initiator_web_contents);
   views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
   web_modal::WebContentsModalDialogManager::FromWebContents(web_contents)
-      ->ShowModalDialog(widget->GetNativeWindow());
+      ->ShowModalDialog(widget->GetNativeWindow(), NULL, NULL);
   return widget;
 }
 
+views::Widget* ShowWebModalDialogWithIndBoundsViews(
+    views::WidgetDelegate* dialog,
+    content::WebContents* initiator_web_contents,
+    bool * independent_bounds) {
+  DCHECK(constrained_window_views_client);
+  // For embedded WebContents, use the embedder's WebContents for constrained
+  // window.
+  content::WebContents* web_contents =
+      guest_view::GuestViewBase::GetTopLevelWebContents(initiator_web_contents);
+  views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
+  web_modal::WebContentsModalDialogManager::FromWebContents(web_contents)
+      ->ShowModalDialog(widget->GetNativeWindow(), independent_bounds,
+                        kHasIndependentBoundsKey);
+  return widget;
+}
+
 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
                                          content::WebContents* web_contents) {
   DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType());
   return views::DialogDelegate::CreateDialogWidget(
       dialog, nullptr,
       web_modal::WebContentsModalDialogManager::FromWebContents(web_contents)
           ->delegate()
           ->GetWebContentsModalDialogHost()
           ->GetHostView());
 }
@@ skipping 27 matching lines @@
     DCHECK_EQ(parent_view, host->GetHostView());
     ModalDialogHostObserver* dialog_host_observer =
         new WidgetModalDialogHostObserverViews(
             host, widget, kWidgetModalDialogHostObserverViewsKey);
     dialog_host_observer->OnPositionRequiresUpdate();
   }
   return widget;
 }
 
 }  // namespace constrained window