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

chrome/browser/ui/views/constrained_web_dialog_delegate_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/webui/constrained_web_dialog_delegate_base.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "components/constrained_window/constrained_window_views.h"
+#include "components/guest_view/browser/guest_view_base.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
 namespace {
 
 // WebContentsObserver that tracks the lifetime of the WebContents to avoid
 // potential use after destruction.
 class InitiatorWebContentsObserver
     : public content::WebContentsObserver {
-  public:
-   explicit InitiatorWebContentsObserver(content::WebContents* web_contents)
-      : content::WebContentsObserver(web_contents) {
-   }
+ public:
+  explicit InitiatorWebContentsObserver(content::WebContents* web_contents)
+      : content::WebContentsObserver(web_contents) {}
 
-  private:
-    DISALLOW_COPY_AND_ASSIGN(InitiatorWebContentsObserver);
+ private:
+  DISALLOW_COPY_AND_ASSIGN(InitiatorWebContentsObserver);
 };
 
 class WebDialogWebContentsDelegateViews
     : public ui::WebDialogWebContentsDelegate {
  public:
   WebDialogWebContentsDelegateViews(content::BrowserContext* browser_context,
                                     InitiatorWebContentsObserver* observer,
                                     views::WebView* web_view)
       : ui::WebDialogWebContentsDelegate(browser_context,
                                          new ChromeWebContentsHandler()),
@@ skipping 97 matching lines @@
       public views::WidgetDelegate {
  public:
   ConstrainedWebDialogDelegateViewViews(
       content::BrowserContext* browser_context,
       ui::WebDialogDelegate* delegate,
       content::WebContents* web_contents,
       const gfx::Size& min_size,
       const gfx::Size& max_size)
       : views::WebView(browser_context),
         initiator_observer_(web_contents),
-        impl_(new ConstrainedWebDialogDelegateViews(browser_context, delegate,
+        impl_(new ConstrainedWebDialogDelegateViews(browser_context,
+                                                    delegate,
                                                     &initiator_observer_,
                                                     this)),
         min_size_(min_size),
         max_size_(max_size) {
     SetWebContents(GetWebContents());
     AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
     if (!max_size_.IsEmpty())
       EnableAutoResize();
   }
   ~ConstrainedWebDialogDelegateViewViews() override {}
@@ skipping 32 matching lines @@
   }
   views::View* GetContentsView() override { return this; }
   views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) override {
     return views::DialogDelegate::CreateDialogFrameView(widget, gfx::Insets());
   }
   bool ShouldShowCloseButton() const override {
     // No close button if the dialog doesn't want a title bar.
     return impl_->GetWebDialogDelegate()->ShouldShowDialogTitle();
   }
-  ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_CHILD; }
+  ui::ModalType GetModalType() const override {
+#if defined(OS_MACOSX)
+    return ui::MODAL_TYPE_CHILD;
+#elif defined(OS_WIN)
+    return ui::MODAL_TYPE_NONE;
+#else  // Linux, ChromeOS
+    return ui::MODAL_TYPE_WINDOW;
+#endif
+  }
 
   // views::WebView:
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override {
     // Pressing ESC closes the dialog.
     DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
     GetWidget()->Close();
     return true;
   }
   gfx::Size GetPreferredSize() const override {
     gfx::Size size;
@@ skipping 20 matching lines @@
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) override {
     if (!max_size_.IsEmpty())
       EnableAutoResize();
   }
   void DocumentOnLoadCompletedInMainFrame() override {
     if (!max_size_.IsEmpty() && initiator_observer_.web_contents()) {
       content::WebContents* top_level_web_contents =
           constrained_window::GetTopLevelWebContents(
               initiator_observer_.web_contents());
-      if (top_level_web_contents) {
-        constrained_window::ShowModalDialog(GetWidget()->GetNativeWindow(),
-                                            top_level_web_contents);
-      }
+      if (top_level_web_contents)
+        constrained_window::ShowTopLevelModalDialog(
+            GetWidget()->GetNativeWindow(),
+            top_level_web_contents, this);
     }
   }
 
  private:
   void EnableAutoResize() {
     content::RenderViewHost* render_view_host =
         GetWebContents()->GetRenderViewHost();
     render_view_host->EnableAutoResize(min_size_, max_size_);
   }
 
   InitiatorWebContentsObserver initiator_observer_;
 
   std::unique_ptr<ConstrainedWebDialogDelegateViews> impl_;
 
   // Minimum and maximum sizes to determine dialog bounds for auto-resizing.
   const gfx::Size min_size_;
   const gfx::Size max_size_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViewViews);
 };
 
 }  // namespace
 
+// TODO: Rename this to ShowConstrainedWebDialogInWindow and propagate to all
+// tests.
+ConstrainedWebDialogDelegate* ShowTopLevelConstrainedWebDialogInWindow(
+    content::BrowserContext* browser_context,
+    ui::WebDialogDelegate* delegate,
+    content::WebContents* web_contents,
+    gfx::NativeView dialog_host_window) {
+  ConstrainedWebDialogDelegateViewViews* dialog =
+      new ConstrainedWebDialogDelegateViewViews(browser_context, delegate,
+                                                web_contents, gfx::Size(),
+                                                gfx::Size());
+  content::WebContents* top_web_contents =
+      guest_view::GuestViewBase::GetTopLevelWebContents(web_contents);
+  views::Widget* widget =
+      views::DialogDelegate::CreateDialogWidget(dialog,
+                                                dialog_host_window,
+                                                nullptr);
+  constrained_window::ShowTopLevelModalDialog(widget->GetNativeWindow(),
+                                              top_web_contents, dialog);
+  return dialog;
+}
+
 ConstrainedWebDialogDelegate* ShowConstrainedWebDialog(
     content::BrowserContext* browser_context,
     ui::WebDialogDelegate* delegate,
     content::WebContents* web_contents) {
   ConstrainedWebDialogDelegateViewViews* dialog =
-      new ConstrainedWebDialogDelegateViewViews(
-          browser_context, delegate, web_contents,
-          gfx::Size(), gfx::Size());
-  constrained_window::ShowWebModalDialogViews(dialog, web_contents);
+      new ConstrainedWebDialogDelegateViewViews(browser_context, delegate,
+                                                web_contents, gfx::Size(),
+                                                gfx::Size());
+  constrained_window::ShowWebModalDialogViews(dialog, web_contents, dialog);
   return dialog;
 }
 
 ConstrainedWebDialogDelegate* ShowConstrainedWebDialogWithAutoResize(
     content::BrowserContext* browser_context,
     ui::WebDialogDelegate* delegate,
     content::WebContents* web_contents,
     const gfx::Size& min_size,
     const gfx::Size& max_size) {
   DCHECK(!min_size.IsEmpty());
   DCHECK(!max_size.IsEmpty());
   ConstrainedWebDialogDelegateViewViews* dialog =
       new ConstrainedWebDialogDelegateViewViews(
           browser_context, delegate, web_contents,
-          min_size, max_size);
-
+          min_size, max_size);//, false);
   // For embedded WebContents, use the embedder's WebContents for constrained
   // window.
   content::WebContents* top_level_web_contents =
       constrained_window::GetTopLevelWebContents(web_contents);
   DCHECK(top_level_web_contents);
   constrained_window::CreateWebModalDialogViews(dialog, top_level_web_contents);
   return dialog;
 }