MacViews: Unify web contents modal dialog types

chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

 // 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/cocoa/constrained_window/constrained_window_mac.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #include "components/web_modal/popup_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/guest_view/guest_view_base.h"
 
 using web_modal::WebContentsModalDialogManager;
 using web_modal::NativeWebContentsModalDialog;
 
+namespace {
+
+class NativeWebContentsModalDialogManagerCocoa
+    : public web_modal::SingleWebContentsDialogManager {
+ public:
+  NativeWebContentsModalDialogManagerCocoa(
+      ConstrainedWindowMac* owner)
+      : owner_(owner) {
+    DCHECK(owner);
+  }
+
+  ~NativeWebContentsModalDialogManagerCocoa() override {}
+
+  // SingleWebContentsDialogManager overrides
+  void Show() override {
+    owner_->ShowWebContentsModalDialog();
+  }
+
+  void Hide() override {}
+
+  void Close() override {
+    owner_->CloseWebContentsModalDialog();
+  }
+
+  void Focus() override {
+    owner_->FocusWebContentsModalDialog();
+  }
+
+  void Pulse() override {
+    owner_->PulseWebContentsModalDialog();
+  }
+
+  void HostChanged(web_modal::WebContentsModalDialogHost* new_host) override {}
+
+  NativeWebContentsModalDialog dialog() override {
+    return owner_->GetNativeDialog();
+  }
+
+ private:
+  ConstrainedWindowMac* owner_;  // Weak. Owns this.
+
+  DISALLOW_COPY_AND_ASSIGN(NativeWebContentsModalDialogManagerCocoa);
+};
+
+}  // namespace
+
 ConstrainedWindowMac::ConstrainedWindowMac(
     ConstrainedWindowMacDelegate* delegate,
     content::WebContents* web_contents,
     id<ConstrainedWindowSheet> sheet)
     : delegate_(delegate),
       web_contents_(NULL),
       sheet_([sheet retain]),
       shown_(false) {
   DCHECK(web_contents);
   extensions::GuestViewBase* guest_view =
       extensions::GuestViewBase::FromWebContents(web_contents);
   // For embedded WebContents, use the embedder's WebContents for constrained
   // window.
   web_contents_ = guest_view && guest_view->embedder_web_contents() ?
                       guest_view->embedder_web_contents() : web_contents;
   DCHECK(sheet_.get());
-  web_modal::PopupManager* popup_manager =
-      web_modal::PopupManager::FromWebContents(web_contents_);
-  if (popup_manager)
-    popup_manager->ShowModalDialog(this, web_contents_);
+  WebContentsModalDialogManager* wm_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents);
+  if (wm_manager) {
+    scoped_ptr<NativeWebContentsModalDialogManagerCocoa> manager(
+        new NativeWebContentsModalDialogManagerCocoa(this));
+    wm_manager->ShowDialogWithManager(GetNativeDialog(), manager.Pass());
+  }
 }
 
 ConstrainedWindowMac::~ConstrainedWindowMac() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
 
 void ConstrainedWindowMac::ShowWebContentsModalDialog() {
   if (shown_)
     return;
 
   NSWindow* parent_window = web_contents_->GetTopLevelNativeWindow();
   NSView* parent_view = GetSheetParentViewForWebContents(web_contents_);
   if (!parent_window || !parent_view)
     return;
 
   shown_ = true;
   ConstrainedWindowSheetController* controller =
       [ConstrainedWindowSheetController
           controllerForParentWindow:parent_window];
   [controller showSheet:sheet_ forParentView:parent_view];
 }
 
 void ConstrainedWindowMac::CloseWebContentsModalDialog() {
   [[ConstrainedWindowSheetController controllerForSheet:sheet_]
       closeSheet:sheet_];
   // TODO(gbillock): get this object in config, not from a global.
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents_);
 
-  // Will result in the delegate being deleted.
+  // Will cause our NativeWebContentsModalDialogManagerCocoa to be deleted.
+  web_contents_modal_dialog_manager->WillClose(GetNativeDialog());
+
+  // Will cause this object to be deleted.
   if (delegate_)
     delegate_->OnConstrainedWindowClosed(this);
-
-  // Will cause this object to be deleted.
-  web_contents_modal_dialog_manager->WillClose(this);
 }
 
 void ConstrainedWindowMac::FocusWebContentsModalDialog() {
 }
 
 void ConstrainedWindowMac::PulseWebContentsModalDialog() {
   [[ConstrainedWindowSheetController controllerForSheet:sheet_]
       pulseSheet:sheet_];
 }
 
 NativeWebContentsModalDialog ConstrainedWindowMac::GetNativeDialog() {
   // TODO(wittman): Ultimately this should be changed to the
   // ConstrainedWindowSheet pointer, in conjunction with the corresponding
   // changes to NativeWebContentsModalDialogManagerCocoa.
-  return this;
+  return [sheet_ sheetWindow];
 }