Index: content/browser/web_contents/web_contents_impl.cc |
=================================================================== |
--- content/browser/web_contents/web_contents_impl.cc (revision 247964) |
+++ content/browser/web_contents/web_contents_impl.cc (working copy) |
@@ -1528,14 +1528,6 @@ |
return widget_host_view; |
} |
-void WebContentsImpl::ShowContextMenu(const ContextMenuParams& params) { |
- // Allow WebContentsDelegates to handle the context menu operation first. |
- if (delegate_ && delegate_->HandleContextMenu(params)) |
- return; |
- |
- render_view_host_delegate_view_->ShowContextMenu(params); |
-} |
- |
void WebContentsImpl::RequestMediaAccessPermission( |
const MediaStreamRequest& request, |
const MediaResponseCallback& callback) { |
@@ -2684,11 +2676,20 @@ |
RenderFrameDeleted(render_frame_host)); |
} |
-void WebContentsImpl::WorkerCrashed() { |
+void WebContentsImpl::WorkerCrashed(RenderFrameHost* render_frame_host) { |
if (delegate_) |
delegate_->WorkerCrashed(this); |
} |
+void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host, |
+ const ContextMenuParams& params) { |
+ // Allow WebContentsDelegates to handle the context menu operation first. |
+ if (delegate_ && delegate_->HandleContextMenu(params)) |
+ return; |
+ |
+ render_view_host_delegate_view_->ShowContextMenu(render_frame_host, params); |
+} |
+ |
WebContents* WebContentsImpl::GetAsWebContents() { |
return this; |
} |