MacViews: Unify web contents modal dialog types

chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm

Index: chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm b/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm
index 5d025f6c8f6e5d865c7591cc6d5070712107f76d..b82e46e862da1e47563a4f6140df194a52df9636 100644
--- a/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm
+++ b/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm
@@ -4,68 +4,16 @@
 
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 
-#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
-#include "components/web_modal/single_web_contents_dialog_manager.h"
-
 using web_modal::NativeWebContentsModalDialog;
 
-namespace {
-
-class NativeWebContentsModalDialogManagerCocoa
-    : public web_modal::SingleWebContentsDialogManager {
- public:
-  NativeWebContentsModalDialogManagerCocoa(
-      NativeWebContentsModalDialog dialog)
-      : dialog_(dialog) {
-  }
-
-  ~NativeWebContentsModalDialogManagerCocoa() override {}
-
-  // SingleWebContentsDialogManager overrides
-  void Show() override {
-    GetConstrainedWindowMac(dialog())->ShowWebContentsModalDialog();
-  }
-
-  void Hide() override {}
-
-  void Close() override {
-    GetConstrainedWindowMac(dialog())->CloseWebContentsModalDialog();
-  }
-
-  void Focus() override {
-    GetConstrainedWindowMac(dialog())->FocusWebContentsModalDialog();
-  }
-
-  void Pulse() override {
-    GetConstrainedWindowMac(dialog())->PulseWebContentsModalDialog();
-  }
-
-  void HostChanged(web_modal::WebContentsModalDialogHost* new_host) override {}
-
-  NativeWebContentsModalDialog dialog() override { return dialog_; }
-
- private:
-  static ConstrainedWindowMac* GetConstrainedWindowMac(
-      NativeWebContentsModalDialog dialog) {
-    return static_cast<ConstrainedWindowMac*>(dialog);
-  }
-
-  // In mac this is a pointer to a ConstrainedWindowMac.
-  // TODO(gbillock): Replace this casting system with a more typesafe call path.
-  NativeWebContentsModalDialog dialog_;
-
-  DISALLOW_COPY_AND_ASSIGN(NativeWebContentsModalDialogManagerCocoa);
-};
-
-}  // namespace
-
 namespace web_modal {
 
 SingleWebContentsDialogManager*
     WebContentsModalDialogManager::CreateNativeWebModalManager(
         NativeWebContentsModalDialog dialog,
         SingleWebContentsDialogManagerDelegate* native_delegate) {
-  return new NativeWebContentsModalDialogManagerCocoa(dialog);
+  NOTREACHED();

[tapted, 2015/02/23 22:33:36]

Perhaps not for this CL... but if we want to keep web_modal::PopupManager I'd be
more "brute-force" about this:
 * Remove CreateNativeWebModalManager completely
 * have web_contents_modal_dialog_manager.cc call the
NativeWebContentsModalDialogManagerViews directly
 * Move web_contents_modal_dialog_manager_views.cc to components/web_modal
 * Add a views (+optional aura) dependency into components/web_modal
 * Stop compiling components/web_modal on non-toolkit-views Mac

Optional:
 * move constrained_window/constrained_window_views.cc into web_modal and delete
components/constrained_window


Note that this approach (i.e. defining a function in the web_modal namespace
outside of components/web_modal to satisfy the linker) is "wrong" anyway, and
it's irritated me when I've been moving other files around.

It's wrong because it adds a linker backreference to components/web_modal.so
which makes it impossible for components/web_modal to actually be a proper
component -- web_modal has to be described as a static_library in its gypi, and
that prevents anything depending on web_modal from being a component as well.

So, if this is only really used for views, I think the right solution is to just
add the views dependency and make web_modal a proper component library.

+  return nullptr;
 }
 
 }  // namespace web_modal