diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 16:40:22 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 16:40:22 +0000 |
| commit | 73c4413af8363581a3eed355a5732906e4096038 (patch) | |
| tree | 9f9870ec911ed25c2c79ac0a8250217c10638516 /content/renderer/render_view_impl.cc | |
| parent | 629cce3c603904278c18bb5e0eb64d6ed6780bcb (diff) | |
| download | chromium_src-73c4413af8363581a3eed355a5732906e4096038.zip chromium_src-73c4413af8363581a3eed355a5732906e4096038.tar.gz chromium_src-73c4413af8363581a3eed355a5732906e4096038.tar.bz2 | |
Temporary change in RenderViewImpl while showContextMenu moves to WebFrameClient.
See the build errors in patchset 2 of https://codereview.chromium.org/183693004/ for more information.
BUG=304341
R=brettw@chromium.org, creis@chromium.org
Review URL: https://codereview.chromium.org/177193004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index c2c707b..1d8e08f 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2427,12 +2427,14 @@ void RenderViewImpl::moveValidationMessage( anchor_in_root_view)); } +#if !defined(SHOW_CONTEXT_MENU_ON_WEB_FRAME_CLIENT) void RenderViewImpl::showContextMenu( WebFrame* frame, const blink::WebContextMenuData& data) { // TODO(jam): move this method to WebFrameClient. RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame); render_frame->showContextMenu(data); } +#endif void RenderViewImpl::clearContextMenu() { context_menu_node_.reset(); |