Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / constrained_window / constrained_window_mac.mm

diff --git a/src/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm b/src/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
index 92a7b68..096fba8 100644 (file)
--- a/src/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
+++ b/src/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
@@ -10,9 +10,11 @@
 #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;
@@ -22,14 +24,21 @@ ConstrainedWindowMac::ConstrainedWindowMac(
     content::WebContents* web_contents,
     id<ConstrainedWindowSheet> sheet)
     : delegate_(delegate),
-      web_contents_(web_contents),
+      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());
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(web_contents);
-  web_contents_modal_dialog_manager->ShowModalDialog(this);
+  web_modal::PopupManager* popup_manager =
+      web_modal::PopupManager::FromWebContents(web_contents_);
+  if (popup_manager)
+    popup_manager->ShowModalDialog(this, web_contents_);
 }
 
 ConstrainedWindowMac::~ConstrainedWindowMac() {