Move web modal dialog manager files into the constrained_window component.

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/constrained_window/native_web_contents_modal_dialog_manager_views.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;
@@ skipping 103 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());
 }
 
+void ShowModalDialog(gfx::NativeWindow dialog,
+                     content::WebContents* initiator_web_contents) {
+  web_modal::WebContentsModalDialogManager* manager =
+      web_modal::WebContentsModalDialogManager::FromWebContents(
+          initiator_web_contents);
+  std::unique_ptr<web_modal::SingleWebContentsDialogManager> dialog_manager(
+      web_modal::WebContentsModalDialogManager::CreateNativeWebModalManager(

[tapted, 2016/06/29 03:02:45]

Can this just call NativeWebContentsModalDialogManagerViews directly rather than
CreateNativeWebModalManager ?

[Patti Lor, 2016/07/13 03:09:41]

I don't think so - there are 4 separate implementations of
CreateNativeWebModalManager() which are included optionally depending on what
kind of build it is. There are two which had/have NOTREACHED() in them
(test_web_contents_modal_dialog_manager_views.cc and
shell_web_contents_modal_dialog_manager.cc), and two which create different
classes (NativeWebContentsModalDialogManagerViews from
web_contents_modal_dialog_manager_views.cc, and
SingleWebContentsDialogManagerViewsMac from
create_native_web_modal_manager_cocoa.mm) depending on whether it's a views or
cocoa build. Not sure if there is another way to have this without using
CreateNativeWebModalManager().

[tapted, 2016/07/13 04:36:19]

The notreached ones shouldn't matter (I think they're only present to workaround
the layering bug). We still care about the Mac one, and you're right about it
being needed where it is SingleWebContentsDialogManagerViewsMac can't be moved
out of c/b/ui/cocoa since it depends on things in
chrome/browser/ui/cocoa/constrained_window/*

So when building with mac_views_browser=1 we shouldn't need the version in
create_native_web_modal_manager_cocoa.mm -- inlining should work.

Then - yep - the problem is that for the current release build, this needs to
invoke the thing in create_native_web_modal_manager_cocoa.mm.

To do this, I think the following will work:
 - in this folder, add show_modal_dialog_views.cc with
NativeWebContentsModalDialogManagerViews called directly - compile this on
not-mac and when mac_views_browser=1
 - also add show_modal_dialog_mac.cc, with this implementation - compile this on
mac when mac_views_browser=0  (and give it a comment saying it's a layering
violation).

I think then the other implementations of
WebContentsModalDialogManager::CreateNativeWebModalManager can be deleted since
it's only needed when show_modal_dialog_mac.cc is used, which will always be
able to call the version in create_native_web_modal_manager_cocoa.mm

[Patti Lor, 2016/07/19 07:39:08]

Done (including deleting the other implementations, except one for tests only -
see description), let me know if the comment (in show_modal_dialog_cocoa.cc)
makes sense!

+          dialog, manager));
+  manager->ShowDialogWithManager(dialog, std::move(dialog_manager));
+}
+
 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(), initiator_web_contents);
   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()
@@ skipping 30 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