[UI] Make auto-resizable constrained web dialog work even when initiated

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"
@@ skipping 127 matching lines @@
   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());
 }
 
+content::WebContents* GetTopLevelWebContents(

[msw, 2016/09/22 13:36:19]

nit: maybe just skip the helper and inline calls to
guest_view::GuestViewBase::GetTopLevelWebContents?

[wjmaclean, 2016/09/22 15:36:48]

Wouldn't that mean that the guestview interface would need to be visible in the
.h file?

[imcheng, 2016/09/22 17:20:58]

Yeah, I did it this way so I don't have to include GuestView stuff in
constrained_web_dialog_delegate_views.cc, and to provide a helper function along
side the other functions in constrained_window.

[msw, 2016/09/22 20:45:17]

Ah, then this is fine, thanks.

+    content::WebContents* initiator_web_contents) {
+  return guest_view::GuestViewBase::GetTopLevelWebContents(
+      initiator_web_contents);
+}
+
 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);
+      GetTopLevelWebContents(initiator_web_contents);
   views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
   ShowModalDialog(widget->GetNativeWindow(), web_contents);
   return widget;
 }
 
 #if defined(OS_MACOSX)
 views::Widget* ShowWebModalDialogWithOverlayViews(
     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);
+      GetTopLevelWebContents(initiator_web_contents);
   views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
   web_modal::WebContentsModalDialogManager* manager =
       web_modal::WebContentsModalDialogManager::FromWebContents(web_contents);
   std::unique_ptr<web_modal::SingleWebContentsDialogManager> dialog_manager(
       new NativeWebContentsModalDialogManagerViewsMac(widget->GetNativeWindow(),
                                                       manager));
   manager->ShowDialogWithManager(widget->GetNativeWindow(),
                                  std::move(dialog_manager));
   return widget;
 }
@@ skipping 39 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