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

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

Issue 191293006: Move GetContextMenuNode from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync and fix android clang error Created 6 years, 9 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
« no previous file with comments | « android_webview/renderer/print_web_view_helper.cc ('k') | chrome/common/print_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc
===================================================================
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc (revision 255957)
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc (working copy)
@@ -1721,7 +1721,10 @@
print_view_manager->PrintNow();
#endif // defined(ENABLE_FULL_PRINTING)
} else {
- rvh->Send(new PrintMsg_PrintNodeUnderContextMenu(rvh->GetRoutingID()));
+ if (render_frame_host) {
+ render_frame_host->Send(new PrintMsg_PrintNodeUnderContextMenu(
+ render_frame_host->GetRoutingID()));
+ }
}
#endif // defined(ENABLE_PRINTING)
break;
@@ -2031,12 +2034,15 @@
}
void RenderViewContextMenu::GetImageThumbnailForSearch() {
- source_web_contents_->GetRenderViewHost()->Send(
- new ChromeViewMsg_RequestThumbnailForContextNode(
- source_web_contents_->GetRenderViewHost()->GetRoutingID(),
- kImageSearchThumbnailMinSize,
- gfx::Size(kImageSearchThumbnailMaxWidth,
- kImageSearchThumbnailMaxHeight)));
+ RenderFrameHost* render_frame_host =
+ RenderFrameHost::FromID(render_process_id_, render_frame_id_);
+ if (!render_frame_host)
+ return;
+ render_frame_host->Send(new ChromeViewMsg_RequestThumbnailForContextNode(
+ render_frame_host->GetRoutingID(),
+ kImageSearchThumbnailMinSize,
+ gfx::Size(kImageSearchThumbnailMaxWidth,
+ kImageSearchThumbnailMaxHeight)));
}
void RenderViewContextMenu::Inspect(int x, int y) {
« no previous file with comments | « android_webview/renderer/print_web_view_helper.cc ('k') | chrome/common/print_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698