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

Unified Diff: chrome/browser/renderer_context_menu/render_view_context_menu.cc

Issue 1117893002: Moving extension code out of "components/" to avoid layering violations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes as per review comments. Created 5 years, 8 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: 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..4c1ae4b5f8f30fb3f68baf6eff6def5518a5a483 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -303,6 +303,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)
+ WebContents* top_level_web_contents =
+ extensions::GuestViewBase::GetTopLevelWebContents(web_contents);
lazyboy 2015/05/05 05:16:16 GuestViewBase is too broad for this, I'd only use
Deepak 2015/05/05 06:28:22 Done.
+ if (top_level_web_contents)
+ return top_level_web_contents;
+#endif
+ return web_contents;
+}
+
bool g_custom_id_ranges_initialized = false;
const int kSpellcheckRadioGroup = 1;
@@ -350,7 +361,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,
« no previous file with comments | « chrome/browser/renderer_context_menu/render_view_context_menu.h ('k') | components/renderer_context_menu/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698