Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / tab_contents / chrome_web_contents_view_delegate_mac.mm

diff --git a/src/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm b/src/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
index f99fc56..3e6d73c 100644 (file)
--- a/src/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
+++ b/src/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
@@ -5,16 +5,16 @@
 #import "chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h"
 
 #import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h"
-#include "chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h"
+#include "chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h"
 #include "chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h"
 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
 
 ChromeWebContentsViewDelegateMac::ChromeWebContentsViewDelegateMac(
     content::WebContents* web_contents)
-    : bookmark_handler_(new WebDragBookmarkHandlerMac),
+    : ContextMenuDelegate(web_contents),
+      bookmark_handler_(new WebDragBookmarkHandlerMac),
       web_contents_(web_contents) {
 }
 
@@ -34,7 +34,19 @@ content::WebDragDestDelegate*
 }
 
 void ChromeWebContentsViewDelegateMac::ShowContextMenu(
+    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
+  ShowMenu(
+      BuildMenu(content::WebContents::FromRenderFrameHost(render_frame_host),
+                params));
+}
+
+void ChromeWebContentsViewDelegateMac::ShowMenu(
+    scoped_ptr<RenderViewContextMenu> menu) {
+  context_menu_.reset(static_cast<RenderViewContextMenuMac*>(menu.release()));
+  if (!context_menu_.get())
+    return;
+
   // The renderer may send the "show context menu" message multiple times, one
   // for each right click mouse event it receives. Normally, this doesn't happen
   // because mouse events are not forwarded once the context menu is showing.
@@ -42,16 +54,38 @@ void ChromeWebContentsViewDelegateMac::ShowContextMenu(
   // the second mouse event arrives. In this case, |ShowContextMenu()| will
   // get called multiple times - if so, don't create another context menu.
   // TODO(asvitkine): Fix the renderer so that it doesn't do this.
-  content::RenderWidgetHostView* widget_view =
-      web_contents_->GetRenderWidgetHostView();
+  content::RenderWidgetHostView* widget_view = GetActiveRenderWidgetHostView();
   if (widget_view && widget_view->IsShowingContextMenu())
     return;
 
-  context_menu_.reset(new RenderViewContextMenuMac(
-      web_contents_,
-      params,
-      web_contents_->GetView()->GetContentNativeView()));
-  context_menu_->Init();
+  context_menu_->Show();
+}
+
+scoped_ptr<RenderViewContextMenu> ChromeWebContentsViewDelegateMac::BuildMenu(
+    content::WebContents* web_contents,
+    const content::ContextMenuParams& params) {
+  scoped_ptr<RenderViewContextMenuMac> menu;
+  content::RenderFrameHost* focused_frame = web_contents->GetFocusedFrame();
+  // If the frame tree does not have a focused frame at this point, do not
+  // bother creating RenderViewContextMenuMac.
+  // This happens if the frame has navigated to a different page before
+  // ContextMenu message was received by the current RenderFrameHost.
+  if (focused_frame) {
+    content::RenderWidgetHostView* widget_view =
+        GetActiveRenderWidgetHostView();
+    menu.reset(new RenderViewContextMenuMac(
+        focused_frame, params, widget_view->GetNativeView()));
+    menu->Init();
+  }
+
+  return menu.PassAs<RenderViewContextMenu>();
+}
+
+content::RenderWidgetHostView*
+ChromeWebContentsViewDelegateMac::GetActiveRenderWidgetHostView() {
+  return web_contents_->GetFullscreenRenderWidgetHostView() ?
+      web_contents_->GetFullscreenRenderWidgetHostView() :
+      web_contents_->GetRenderWidgetHostView();
 }
 
 namespace chrome {