Chromium Code Reviews| Index: components/renderer_context_menu/render_view_context_menu_base.cc |
| diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc |
| index cda6c4667aef1908774a90842753fd62598a7b95..424168f70eafab1859f9ace2ce73b2f9d4b091ad 100644 |
| --- a/components/renderer_context_menu/render_view_context_menu_base.cc |
| +++ b/components/renderer_context_menu/render_view_context_menu_base.cc |
| @@ -15,6 +15,9 @@ |
| #include "content/public/browser/render_widget_host_view.h" |
| #include "content/public/browser/web_contents.h" |
| #include "content/public/common/menu_item.h" |
| +#if defined(ENABLE_EXTENSIONS) |
| +#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" |
| +#endif |
| #include "third_party/WebKit/public/web/WebContextMenuData.h" |
| using blink::WebContextMenuData; |
| @@ -126,6 +129,18 @@ void AddCustomItemsToMenu(const std::vector<content::MenuItem>& items, |
| } |
| } |
| +content::WebContents* GetWebContentsToUse(content::WebContents* web_contents) { |
| + // If we're viewing the PDF in a MimeHandlerViewGuest, use its embedder |
|
raymes
2015/02/11 00:45:39
Please don't mention PDF here, just mention MimeHa
Deepak
2015/02/11 05:27:01
Done.
|
| + // WebContents. |
| +#if defined(ENABLE_EXTENSIONS) |
| + auto guest_view = |
| + extensions::MimeHandlerViewGuest::FromWebContents(web_contents); |
| + if (guest_view) |
| + return guest_view->embedder_web_contents(); |
| +#endif |
| + return web_contents; |
| +} |
| + |
| } // namespace |
| // static |
| @@ -154,7 +169,8 @@ RenderViewContextMenuBase::RenderViewContextMenuBase( |
| content::RenderFrameHost* render_frame_host, |
| const content::ContextMenuParams& params) |
| : params_(params), |
| - source_web_contents_(WebContents::FromRenderFrameHost(render_frame_host)), |
| + source_web_contents_(GetWebContentsToUse( |
| + WebContents::FromRenderFrameHost(render_frame_host))), |
| browser_context_(source_web_contents_->GetBrowserContext()), |
| menu_model_(this), |
| render_frame_id_(render_frame_host->GetRoutingID()), |