Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc |
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
index d8e0ccfb443f62e5f8f7e8112b7495e6fcd870f2..87097f85be51b826d03fb770b86361b7750513ab 100644 |
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
@@ -762,20 +762,9 @@ void RenderViewContextMenu::AppendMediaItems() { |
} |
void RenderViewContextMenu::AppendPluginItems() { |
- if (params_.page_url == params_.src_url) { |
- // Full page plugin, so show page menu items. |
- if (params_.link_url.is_empty() && params_.selection_text.empty()) |
- AppendPageItems(); |
- } else { |
- menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEAVAS, |
- IDS_CONTENT_CONTEXT_SAVEPAGEAS); |
- // The "Print" menu item should always be included for plugins. If |
- // content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT) |
- // is true the item will be added inside AppendPrintItem(). Otherwise we |
- // add "Print" here. |
- if (!content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT)) |
- menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT); |
- } |
+ // Full page plugin, so show page menu items. |
raymes
2015/02/11 00:45:39
This breaks the embedded case. The question is wha
Deepak
2015/02/11 05:27:00
Acknowledged.
|
+ if (params_.link_url.is_empty() && params_.selection_text.empty()) |
+ AppendPageItems(); |
} |
void RenderViewContextMenu::AppendPageItems() { |
@@ -1787,6 +1776,9 @@ void RenderViewContextMenu::MediaPlayerActionAt( |
void RenderViewContextMenu::PluginActionAt( |
const gfx::Point& location, |
const WebPluginAction& action) { |
- source_web_contents_->GetRenderViewHost()-> |
- ExecutePluginActionAtLocation(location, action); |
+ RenderFrameHost* render_frame_host = GetRenderFrameHost(); |
+ if (!render_frame_host) |
+ return; |
+ WebContents::FromRenderFrameHost(render_frame_host)->GetRenderViewHost() |
+ ->ExecutePluginActionAtLocation(location, action); |
raymes
2015/02/11 00:45:39
Which WebContents does source_web_contents_ repres
Deepak
2015/02/11 05:27:01
source_web_contents_ represents here guest view em
raymes
2015/02/11 23:03:35
Ah, I see. Thanks!
|
} |