Chromium Code Reviews| 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> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <vector> | |
| 11 | |
| 10 #include "base/memory/shared_memory_handle.h" | 12 #include "base/memory/shared_memory_handle.h" |
| 11 #include "ipc/ipc_platform_file.h" | 13 #include "ipc/ipc_platform_file.h" |
| 12 #include "net/base/ip_endpoint.h" | 14 #include "net/base/ip_endpoint.h" |
| 13 #include "remoting/host/chromoting_param_traits.h" | 15 #include "remoting/host/chromoting_param_traits.h" |
| 14 #include "remoting/host/screen_resolution.h" | 16 #include "remoting/host/screen_resolution.h" |
| 15 #include "remoting/protocol/errors.h" | 17 #include "remoting/protocol/errors.h" |
| 16 #include "remoting/protocol/transport.h" | 18 #include "remoting/protocol/transport.h" |
| 17 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" | 19 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
| 18 | 20 |
| 19 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ | 21 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 81 int /* terminal_id */) | 83 int /* terminal_id */) |
| 82 | 84 |
| 83 // Changes the screen resolution in the given desktop session. | 85 // Changes the screen resolution in the given desktop session. |
| 84 IPC_MESSAGE_CONTROL2(ChromotingNetworkDaemonMsg_SetScreenResolution, | 86 IPC_MESSAGE_CONTROL2(ChromotingNetworkDaemonMsg_SetScreenResolution, |
| 85 int /* terminal_id */, | 87 int /* terminal_id */, |
| 86 remoting::ScreenResolution /* resolution */) | 88 remoting::ScreenResolution /* resolution */) |
| 87 | 89 |
| 88 // Serialized remoting::protocol::TransportRoute structure. | 90 // Serialized remoting::protocol::TransportRoute structure. |
| 89 IPC_STRUCT_BEGIN(SerializedTransportRoute) | 91 IPC_STRUCT_BEGIN(SerializedTransportRoute) |
| 90 IPC_STRUCT_MEMBER(int, type) | 92 IPC_STRUCT_MEMBER(int, type) |
| 91 IPC_STRUCT_MEMBER(net::IPAddressNumber, remote_address) | 93 IPC_STRUCT_MEMBER(std::vector<uint8_t>, remote_address) |
|
dcheng
2016/04/04 18:40:36
This is kind of unfortunate: content already has a
martijnc
2016/04/05 17:02:35
Added ParamTraits for net::IPAddress and net::IPEn
| |
| 92 IPC_STRUCT_MEMBER(uint16_t, remote_port) | 94 IPC_STRUCT_MEMBER(uint16_t, remote_port) |
| 93 IPC_STRUCT_MEMBER(net::IPAddressNumber, local_address) | 95 IPC_STRUCT_MEMBER(std::vector<uint8_t>, local_address) |
| 94 IPC_STRUCT_MEMBER(uint16_t, local_port) | 96 IPC_STRUCT_MEMBER(uint16_t, local_port) |
| 95 IPC_STRUCT_END() | 97 IPC_STRUCT_END() |
| 96 | 98 |
| 97 // Hosts status notifications (see HostStatusObserver interface) sent by | 99 // Hosts status notifications (see HostStatusObserver interface) sent by |
| 98 // IpcHostEventLogger. | 100 // IpcHostEventLogger. |
| 99 IPC_MESSAGE_CONTROL1(ChromotingNetworkDaemonMsg_AccessDenied, | 101 IPC_MESSAGE_CONTROL1(ChromotingNetworkDaemonMsg_AccessDenied, |
| 100 std::string /* jid */) | 102 std::string /* jid */) |
| 101 | 103 |
| 102 IPC_MESSAGE_CONTROL1(ChromotingNetworkDaemonMsg_ClientAuthenticated, | 104 IPC_MESSAGE_CONTROL1(ChromotingNetworkDaemonMsg_ClientAuthenticated, |
| 103 std::string /* jid */) | 105 std::string /* jid */) |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 261 // request and response messages. It is destroyed once the client disconnects. | 263 // request and response messages. It is destroyed once the client disconnects. |
| 262 | 264 |
| 263 // The IPC channel path for this remote_security_key connection. This message | 265 // The IPC channel path for this remote_security_key connection. This message |
| 264 // is sent from the well-known IPC server channel. | 266 // is sent from the well-known IPC server channel. |
| 265 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_ConnectionDetails, | 267 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_ConnectionDetails, |
| 266 std::string /* IPC Server path */) | 268 std::string /* IPC Server path */) |
| 267 | 269 |
| 268 // The array of bytes representing a security key response from the remote | 270 // The array of bytes representing a security key response from the remote |
| 269 // client. This message is sent over the per-client IPC channel. | 271 // client. This message is sent over the per-client IPC channel. |
| 270 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_Response, | 272 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_Response, |
| 271 std::string /* response bytes */) | 273 std::string /* response bytes */) |
| OLD | NEW |