Index: chrome/renderer/render_view.cc |
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc |
index 1e2be189e12e8020a132d90d799b4d82b4a3190c..a2ea2b288a93c0af8162f90277740a0228eb4319 100644 |
--- a/chrome/renderer/render_view.cc |
+++ b/chrome/renderer/render_view.cc |
@@ -4712,8 +4712,13 @@ void RenderView::OnSetAltErrorPageURL(const GURL& url) { |
alternate_error_page_url_ = url; |
} |
-void RenderView::OnCustomContextMenuAction(unsigned action) { |
- webview()->performCustomContextMenuAction(action); |
+void RenderView::OnCustomContextMenuAction( |
+ const webkit_glue::CustomContextMenuContext& custom_context, |
+ unsigned action) { |
+ if (custom_context.is_pepper_menu) |
+ pepper_delegate_.OnCustomContextMenuAction(custom_context, action); |
+ else |
+ webview()->performCustomContextMenuAction(action); |
} |
void RenderView::OnTranslatePage(int page_id, |
@@ -5770,6 +5775,10 @@ void RenderView::OnJavaScriptStressTestControl(int cmd, int param) { |
} |
} |
-void RenderView::OnContextMenuClosed() { |
- context_menu_node_.reset(); |
+void RenderView::OnContextMenuClosed( |
+ const webkit_glue::CustomContextMenuContext& custom_context) { |
+ if (custom_context.is_pepper_menu) |
+ pepper_delegate_.OnContextMenuClosed(custom_context); |
+ else |
+ context_menu_node_.reset(); |
} |