Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1039)

Unified Diff: components/renderer_context_menu/render_view_context_menu_base.cc

Issue 913663002: Fix for Incomplete context menu is shown on pdf files and reload,back,forward options are missing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing comment. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..1d7ae501e50b28ace4417d9729118dc61e37bafe 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,17 @@ void AddCustomItemsToMenu(const std::vector<content::MenuItem>& items,
}
}
+content::WebContents* GetWebContentsToUse(content::WebContents* web_contents) {
+// If we're viewing in a MimeHandlerViewGuest, use its embedder 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 +168,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()),

Powered by Google App Engine
This is Rietveld 408576698