From 9c9343bd7960182b0c7d21e25d6ad69c348facc3 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Sat, 8 Mar 2014 02:56:07 +0000 Subject: Almost finish moving context_menu_node_ from RenderViewImpl to RenderFrameImpl. The remaining uses of context_menu_node_ are easy to convert, but I've left them to a future cl so as to not make this cl any bigger. The main part of this cl is to move the Copy edit command from RenderViewHost to RenderFrameHost. To do that, I also had to convert Cut and Paste at the same time because of BrowserView. BUG=304341 R=nasko@chromium.org Review URL: https://codereview.chromium.org/183923030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255735 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/render_view_impl.cc | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'content/renderer/render_view_impl.cc') diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 552224a..296fce9 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -1084,12 +1084,9 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { bool handled = true; bool msg_is_ok = true; IPC_BEGIN_MESSAGE_MAP_EX(RenderViewImpl, message, msg_is_ok) - IPC_MESSAGE_HANDLER(InputMsg_Copy, OnCopy) - IPC_MESSAGE_HANDLER(InputMsg_Cut, OnCut) IPC_MESSAGE_HANDLER(InputMsg_Delete, OnDelete) IPC_MESSAGE_HANDLER(InputMsg_ExecuteEditCommand, OnExecuteEditCommand) IPC_MESSAGE_HANDLER(InputMsg_MoveCaret, OnMoveCaret) - IPC_MESSAGE_HANDLER(InputMsg_Paste, OnPaste) IPC_MESSAGE_HANDLER(InputMsg_PasteAndMatchStyle, OnPasteAndMatchStyle) IPC_MESSAGE_HANDLER(InputMsg_Redo, OnRedo) IPC_MESSAGE_HANDLER(InputMsg_Replace, OnReplace) @@ -1287,26 +1284,6 @@ void RenderViewImpl::OnUpdateTargetURLAck() { target_url_status_ = TARGET_NONE; } -void RenderViewImpl::OnCopy() { - if (!webview()) - return; - - base::AutoReset handling_select_range(&handling_select_range_, true); - WebNode current_node = context_menu_node_.isNull() ? - GetFocusedElement() : context_menu_node_; - webview()->focusedFrame()->executeCommand(WebString::fromUTF8("Copy"), - current_node); -} - -void RenderViewImpl::OnCut() { - if (!webview()) - return; - - base::AutoReset handling_select_range(&handling_select_range_, true); - webview()->focusedFrame()->executeCommand(WebString::fromUTF8("Cut"), - GetFocusedElement()); -} - void RenderViewImpl::OnDelete() { if (!webview()) return; @@ -1333,15 +1310,6 @@ void RenderViewImpl::OnMoveCaret(const gfx::Point& point) { webview()->focusedFrame()->moveCaretSelection(point); } -void RenderViewImpl::OnPaste() { - if (!webview()) - return; - - base::AutoReset handling_select_range(&handling_select_range_, true); - webview()->focusedFrame()->executeCommand(WebString::fromUTF8("Paste"), - GetFocusedElement()); -} - void RenderViewImpl::OnPasteAndMatchStyle() { if (!webview()) return; -- cgit v1.1