OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // Multiply-included message header, no traditional include guard. | 5 // Multiply-included message header, no traditional include guard. |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/process/process.h" | 9 #include "base/process/process.h" |
10 #include "cc/surfaces/surface.h" | 10 #include "cc/surfaces/surface.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 IPC_MESSAGE_CONTROL5( | 68 IPC_MESSAGE_CONTROL5( |
69 BrowserPluginHostMsg_ImeSetComposition, | 69 BrowserPluginHostMsg_ImeSetComposition, |
70 int /* browser_plugin_instance_id */, | 70 int /* browser_plugin_instance_id */, |
71 std::string /* text */, | 71 std::string /* text */, |
72 std::vector<blink::WebCompositionUnderline> /* underlines */, | 72 std::vector<blink::WebCompositionUnderline> /* underlines */, |
73 int /* selectiont_start */, | 73 int /* selectiont_start */, |
74 int /* selection_end */) | 74 int /* selection_end */) |
75 | 75 |
76 // This message is sent from BrowserPlugin to BrowserPluginGuest to notify that | 76 // This message is sent from BrowserPlugin to BrowserPluginGuest to notify that |
77 // confirming the current composition is requested. | 77 // confirming the current composition is requested. |
78 IPC_MESSAGE_CONTROL3(BrowserPluginHostMsg_ImeConfirmComposition, | 78 IPC_MESSAGE_CONTROL4(BrowserPluginHostMsg_ImeConfirmComposition, |
79 int /* browser_plugin_instance_id */, | 79 int /* browser_plugin_instance_id */, |
80 std::string /* text */, | 80 std::string /* text */, |
81 bool /* keep selection */) | 81 bool /* keep selection */, |
| 82 int /* newCursorPosition */) |
82 | 83 |
83 // Deletes the current selection plus the specified number of characters before | 84 // Deletes the current selection plus the specified number of characters before |
84 // and after the selection or caret. | 85 // and after the selection or caret. |
85 IPC_MESSAGE_CONTROL3(BrowserPluginHostMsg_ExtendSelectionAndDelete, | 86 IPC_MESSAGE_CONTROL3(BrowserPluginHostMsg_ExtendSelectionAndDelete, |
86 int /* browser_plugin_instance_id */, | 87 int /* browser_plugin_instance_id */, |
87 int /* before */, | 88 int /* before */, |
88 int /* after */) | 89 int /* after */) |
89 | 90 |
90 // This message is sent to the browser process to indicate that the | 91 // This message is sent to the browser process to indicate that the |
91 // BrowserPlugin identified by |browser_plugin_instance_id| is ready to serve | 92 // BrowserPlugin identified by |browser_plugin_instance_id| is ready to serve |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 | 185 |
185 // Forwards a PointerLock Unlock request to the BrowserPlugin. | 186 // Forwards a PointerLock Unlock request to the BrowserPlugin. |
186 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetMouseLock, | 187 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetMouseLock, |
187 int /* browser_plugin_instance_id */, | 188 int /* browser_plugin_instance_id */, |
188 bool /* enable */) | 189 bool /* enable */) |
189 | 190 |
190 // Sends text to be displayed in tooltip. | 191 // Sends text to be displayed in tooltip. |
191 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetTooltipText, | 192 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetTooltipText, |
192 int /* browser_plugin_instance_id */, | 193 int /* browser_plugin_instance_id */, |
193 base::string16 /* tooltip_text */) | 194 base::string16 /* tooltip_text */) |
OLD | NEW |