Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 6f1b764f5eaba05664aa4c254707fbb66d410ece..b0c1be77d607ae87d9692a9e62eb34ff09cbb31a 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -42,6 +42,7 @@ |
#include "content/common/request_extra_data.h" |
#include "content/common/socket_stream_handle_data.h" |
#include "content/common/ssl_status_serialization.h" |
+#include "content/common/view_input_messages.h" |
#include "content/common/view_messages.h" |
#include "content/common/webmessageportchannel_impl.h" |
#include "content/public/common/bindings_policy.h" |
@@ -1003,28 +1004,28 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(ViewMsg_Navigate, OnNavigate) |
IPC_MESSAGE_HANDLER(ViewMsg_Stop, OnStop) |
IPC_MESSAGE_HANDLER(ViewMsg_ReloadFrame, OnReloadFrame) |
- IPC_MESSAGE_HANDLER(ViewMsg_Undo, OnUndo) |
- IPC_MESSAGE_HANDLER(ViewMsg_Redo, OnRedo) |
- IPC_MESSAGE_HANDLER(ViewMsg_Cut, OnCut) |
- IPC_MESSAGE_HANDLER(ViewMsg_Copy, OnCopy) |
- IPC_MESSAGE_HANDLER(ViewMsg_Paste, OnPaste) |
- IPC_MESSAGE_HANDLER(ViewMsg_PasteAndMatchStyle, OnPasteAndMatchStyle) |
- IPC_MESSAGE_HANDLER(ViewMsg_Replace, OnReplace) |
- IPC_MESSAGE_HANDLER(ViewMsg_ReplaceMisspelling, OnReplaceMisspelling) |
- IPC_MESSAGE_HANDLER(ViewMsg_Delete, OnDelete) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_Undo, OnUndo) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_Redo, OnRedo) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_Cut, OnCut) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_Copy, OnCopy) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_Paste, OnPaste) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_PasteAndMatchStyle, OnPasteAndMatchStyle) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_Replace, OnReplace) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_ReplaceMisspelling, OnReplaceMisspelling) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_Delete, OnDelete) |
IPC_MESSAGE_HANDLER(ViewMsg_SetName, OnSetName) |
- IPC_MESSAGE_HANDLER(ViewMsg_SelectAll, OnSelectAll) |
- IPC_MESSAGE_HANDLER(ViewMsg_Unselect, OnUnselect) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_SelectAll, OnSelectAll) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_Unselect, OnUnselect) |
IPC_MESSAGE_HANDLER(ViewMsg_SetEditableSelectionOffsets, |
OnSetEditableSelectionOffsets) |
IPC_MESSAGE_HANDLER(ViewMsg_SetCompositionFromExistingText, |
OnSetCompositionFromExistingText) |
IPC_MESSAGE_HANDLER(ViewMsg_ExtendSelectionAndDelete, |
OnExtendSelectionAndDelete) |
- IPC_MESSAGE_HANDLER(ViewMsg_SelectRange, OnSelectRange) |
- IPC_MESSAGE_HANDLER(ViewMsg_MoveCaret, OnMoveCaret) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_SelectRange, OnSelectRange) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_MoveCaret, OnMoveCaret) |
IPC_MESSAGE_HANDLER(ViewMsg_CopyImageAt, OnCopyImageAt) |
- IPC_MESSAGE_HANDLER(ViewMsg_ExecuteEditCommand, OnExecuteEditCommand) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_ExecuteEditCommand, OnExecuteEditCommand) |
IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind) |
IPC_MESSAGE_HANDLER(ViewMsg_StopFinding, OnStopFinding) |
IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom) |
@@ -1047,7 +1048,7 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
OnDragSourceSystemDragEnded) |
IPC_MESSAGE_HANDLER(ViewMsg_AllowBindings, OnAllowBindings) |
IPC_MESSAGE_HANDLER(ViewMsg_SetInitialFocus, OnSetInitialFocus) |
- IPC_MESSAGE_HANDLER(ViewMsg_ScrollFocusedEditableNodeIntoRect, |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_ScrollFocusedEditableNodeIntoRect, |
OnScrollFocusedEditableNodeIntoRect) |
IPC_MESSAGE_HANDLER(ViewMsg_UpdateTargetURL_ACK, OnUpdateTargetURLAck) |
IPC_MESSAGE_HANDLER(ViewMsg_UpdateWebPreferences, OnUpdateWebPreferences) |
@@ -1077,7 +1078,7 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
OnOrientationChangeEvent) |
IPC_MESSAGE_HANDLER(ViewMsg_PluginActionAt, OnPluginActionAt) |
IPC_MESSAGE_HANDLER(ViewMsg_SetActive, OnSetActive) |
- IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent, |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_SetEditCommandsForNextKeyEvent, |
OnSetEditCommandsForNextKeyEvent) |
IPC_MESSAGE_HANDLER(ViewMsg_CustomContextMenuAction, |
OnCustomContextMenuAction) |
@@ -1101,7 +1102,7 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(ViewMsg_SetAccessibilityMode, OnSetAccessibilityMode) |
IPC_MESSAGE_HANDLER(ViewMsg_DisownOpener, OnDisownOpener) |
#if defined(OS_ANDROID) |
- IPC_MESSAGE_HANDLER(ViewMsg_ActivateNearestFindResult, |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_ActivateNearestFindResult, |
OnActivateNearestFindResult) |
IPC_MESSAGE_HANDLER(ViewMsg_FindMatchRects, OnFindMatchRects) |
IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) |
@@ -1110,7 +1111,7 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(ViewMsg_UpdateTopControlsState, |
OnUpdateTopControlsState) |
#elif defined(OS_MACOSX) |
- IPC_MESSAGE_HANDLER(ViewMsg_CopyToFindPboard, OnCopyToFindPboard) |
+ IPC_MESSAGE_HANDLER(ViewInputMsg_CopyToFindPboard, OnCopyToFindPboard) |
IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionCompleted, |
OnPluginImeCompositionCompleted) |
IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItem, OnSelectPopupMenuItem) |