| 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 #ifndef REMOTING_HOST_CHROMOTING_MESSAGES_H_ | 5 #ifndef REMOTING_HOST_CHROMOTING_MESSAGES_H_ |
| 6 #define REMOTING_HOST_CHROMOTING_MESSAGES_H_ | 6 #define REMOTING_HOST_CHROMOTING_MESSAGES_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include "ipc/ipc_platform_file.h" | 10 #include "ipc/ipc_platform_file.h" |
| 9 #include "net/base/ip_endpoint.h" | 11 #include "net/base/ip_endpoint.h" |
| 10 #include "remoting/host/chromoting_param_traits.h" | 12 #include "remoting/host/chromoting_param_traits.h" |
| 11 #include "remoting/host/screen_resolution.h" | 13 #include "remoting/host/screen_resolution.h" |
| 12 #include "remoting/protocol/errors.h" | 14 #include "remoting/protocol/errors.h" |
| 13 #include "remoting/protocol/transport.h" | 15 #include "remoting/protocol/transport.h" |
| 14 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" | 16 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
| 15 | 17 |
| 16 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ | 18 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ |
| 17 | 19 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 81 |
| 80 // Changes the screen resolution in the given desktop session. | 82 // Changes the screen resolution in the given desktop session. |
| 81 IPC_MESSAGE_CONTROL2(ChromotingNetworkDaemonMsg_SetScreenResolution, | 83 IPC_MESSAGE_CONTROL2(ChromotingNetworkDaemonMsg_SetScreenResolution, |
| 82 int /* terminal_id */, | 84 int /* terminal_id */, |
| 83 remoting::ScreenResolution /* resolution */) | 85 remoting::ScreenResolution /* resolution */) |
| 84 | 86 |
| 85 // Serialized remoting::protocol::TransportRoute structure. | 87 // Serialized remoting::protocol::TransportRoute structure. |
| 86 IPC_STRUCT_BEGIN(SerializedTransportRoute) | 88 IPC_STRUCT_BEGIN(SerializedTransportRoute) |
| 87 IPC_STRUCT_MEMBER(int, type) | 89 IPC_STRUCT_MEMBER(int, type) |
| 88 IPC_STRUCT_MEMBER(net::IPAddressNumber, remote_address) | 90 IPC_STRUCT_MEMBER(net::IPAddressNumber, remote_address) |
| 89 IPC_STRUCT_MEMBER(uint16, remote_port) | 91 IPC_STRUCT_MEMBER(uint16_t, remote_port) |
| 90 IPC_STRUCT_MEMBER(net::IPAddressNumber, local_address) | 92 IPC_STRUCT_MEMBER(net::IPAddressNumber, local_address) |
| 91 IPC_STRUCT_MEMBER(uint16, local_port) | 93 IPC_STRUCT_MEMBER(uint16_t, local_port) |
| 92 IPC_STRUCT_END() | 94 IPC_STRUCT_END() |
| 93 | 95 |
| 94 // Hosts status notifications (see HostStatusObserver interface) sent by | 96 // Hosts status notifications (see HostStatusObserver interface) sent by |
| 95 // IpcHostEventLogger. | 97 // IpcHostEventLogger. |
| 96 IPC_MESSAGE_CONTROL1(ChromotingNetworkDaemonMsg_AccessDenied, | 98 IPC_MESSAGE_CONTROL1(ChromotingNetworkDaemonMsg_AccessDenied, |
| 97 std::string /* jid */) | 99 std::string /* jid */) |
| 98 | 100 |
| 99 IPC_MESSAGE_CONTROL1(ChromotingNetworkDaemonMsg_ClientAuthenticated, | 101 IPC_MESSAGE_CONTROL1(ChromotingNetworkDaemonMsg_ClientAuthenticated, |
| 100 std::string /* jid */) | 102 std::string /* jid */) |
| 101 | 103 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 131 // where the desktop process is running. | 133 // where the desktop process is running. |
| 132 IPC_MESSAGE_CONTROL0(ChromotingDesktopDaemonMsg_InjectSas) | 134 IPC_MESSAGE_CONTROL0(ChromotingDesktopDaemonMsg_InjectSas) |
| 133 | 135 |
| 134 //----------------------------------------------------------------------------- | 136 //----------------------------------------------------------------------------- |
| 135 // Chromoting messages sent from the desktop to the network process. | 137 // Chromoting messages sent from the desktop to the network process. |
| 136 | 138 |
| 137 // Notifies the network process that a shared buffer has been created. | 139 // Notifies the network process that a shared buffer has been created. |
| 138 IPC_MESSAGE_CONTROL3(ChromotingDesktopNetworkMsg_CreateSharedBuffer, | 140 IPC_MESSAGE_CONTROL3(ChromotingDesktopNetworkMsg_CreateSharedBuffer, |
| 139 int /* id */, | 141 int /* id */, |
| 140 IPC::PlatformFileForTransit /* handle */, | 142 IPC::PlatformFileForTransit /* handle */, |
| 141 uint32 /* size */) | 143 uint32_t /* size */) |
| 142 | 144 |
| 143 // Request the network process to stop using a shared buffer. | 145 // Request the network process to stop using a shared buffer. |
| 144 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_ReleaseSharedBuffer, | 146 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_ReleaseSharedBuffer, |
| 145 int /* id */) | 147 int /* id */) |
| 146 | 148 |
| 147 // Serialized webrtc::DesktopFrame. | 149 // Serialized webrtc::DesktopFrame. |
| 148 IPC_STRUCT_BEGIN(SerializedDesktopFrame) | 150 IPC_STRUCT_BEGIN(SerializedDesktopFrame) |
| 149 // ID of the shared memory buffer containing the pixels. | 151 // ID of the shared memory buffer containing the pixels. |
| 150 IPC_STRUCT_MEMBER(int, shared_buffer_id) | 152 IPC_STRUCT_MEMBER(int, shared_buffer_id) |
| 151 | 153 |
| 152 // Width of a single row of pixels in bytes. | 154 // Width of a single row of pixels in bytes. |
| 153 IPC_STRUCT_MEMBER(int, bytes_per_row) | 155 IPC_STRUCT_MEMBER(int, bytes_per_row) |
| 154 | 156 |
| 155 // Captured region. | 157 // Captured region. |
| 156 IPC_STRUCT_MEMBER(std::vector<webrtc::DesktopRect>, dirty_region) | 158 IPC_STRUCT_MEMBER(std::vector<webrtc::DesktopRect>, dirty_region) |
| 157 | 159 |
| 158 // Dimensions of the buffer in pixels. | 160 // Dimensions of the buffer in pixels. |
| 159 IPC_STRUCT_MEMBER(webrtc::DesktopSize, dimensions) | 161 IPC_STRUCT_MEMBER(webrtc::DesktopSize, dimensions) |
| 160 | 162 |
| 161 // Time spent in capture. Unit is in milliseconds. | 163 // Time spent in capture. Unit is in milliseconds. |
| 162 IPC_STRUCT_MEMBER(int64, capture_time_ms) | 164 IPC_STRUCT_MEMBER(int64_t, capture_time_ms) |
| 163 | 165 |
| 164 // Latest event timestamp supplied by the client for performance tracking. | 166 // Latest event timestamp supplied by the client for performance tracking. |
| 165 IPC_STRUCT_MEMBER(int64, latest_event_timestamp) | 167 IPC_STRUCT_MEMBER(int64_t, latest_event_timestamp) |
| 166 | 168 |
| 167 // DPI for this frame. | 169 // DPI for this frame. |
| 168 IPC_STRUCT_MEMBER(webrtc::DesktopVector, dpi) | 170 IPC_STRUCT_MEMBER(webrtc::DesktopVector, dpi) |
| 169 IPC_STRUCT_END() | 171 IPC_STRUCT_END() |
| 170 | 172 |
| 171 // Notifies the network process that a shared buffer has been created. | 173 // Notifies the network process that a shared buffer has been created. |
| 172 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, | 174 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, |
| 173 SerializedDesktopFrame /* frame */ ) | 175 SerializedDesktopFrame /* frame */ ) |
| 174 | 176 |
| 175 // Carries a cursor share update from the desktop session agent to the client. | 177 // Carries a cursor share update from the desktop session agent to the client. |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 std::string /* serialized_event */ ) | 228 std::string /* serialized_event */ ) |
| 227 | 229 |
| 228 // Carries a touch event from the client to the desktop session agent. | 230 // Carries a touch event from the client to the desktop session agent. |
| 229 // |serialized_event| is a serialized protocol::TouchEvent. | 231 // |serialized_event| is a serialized protocol::TouchEvent. |
| 230 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectTouchEvent, | 232 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectTouchEvent, |
| 231 std::string /* serialized_event */ ) | 233 std::string /* serialized_event */ ) |
| 232 | 234 |
| 233 // Changes the screen resolution in the desktop session. | 235 // Changes the screen resolution in the desktop session. |
| 234 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_SetScreenResolution, | 236 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_SetScreenResolution, |
| 235 remoting::ScreenResolution /* resolution */) | 237 remoting::ScreenResolution /* resolution */) |
| OLD | NEW |