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 4020c65e6fa79de390e67fdc08849191ba757b8a..c513e1495010b60a5e0f3824b6c414b0781372dd 100644 |
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
@@ -103,6 +103,10 @@ |
#include "ui/gfx/geometry/size.h" |
#include "ui/gfx/text_elider.h" |
+#if defined(ENABLE_EXTENSIONS) |
+#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" |
+#endif |
+ |
#if defined(ENABLE_PRINTING) |
#include "chrome/browser/printing/print_view_manager_common.h" |
#include "components/printing/common/print_messages.h" |
@@ -303,6 +307,17 @@ content::Referrer CreateSaveAsReferrer( |
content::Referrer(referring_url.GetAsReferrer(), params.referrer_policy)); |
} |
+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); |
Fady Samuel
2015/05/04 04:16:10
Taking a look at this code now: is this actually w
Deepak
2015/05/04 06:06:45
Actually I have fixed the issue in which , 'Back',
|
+ if (guest_view) |
+ return guest_view->embedder_web_contents(); |
+#endif |
+ return web_contents; |
+} |
+ |
bool g_custom_id_ranges_initialized = false; |
const int kSpellcheckRadioGroup = 1; |
@@ -350,7 +365,8 @@ RenderViewContextMenu::RenderViewContextMenu( |
base::Bind(MenuItemMatchesParams, params_)), |
protocol_handler_submenu_model_(this), |
protocol_handler_registry_( |
- ProtocolHandlerRegistryFactory::GetForBrowserContext(GetProfile())) { |
+ ProtocolHandlerRegistryFactory::GetForBrowserContext(GetProfile())), |
+ embedder_web_contents_(GetWebContentsToUse(source_web_contents_)) { |
if (!g_custom_id_ranges_initialized) { |
g_custom_id_ranges_initialized = true; |
SetContentCustomCommandIdRange(IDC_CONTENT_CONTEXT_CUSTOM_FIRST, |