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 "base/memory/shared_memory_handle.h" | 10 #include "base/memory/shared_memory_handle.h" |
| 11 #include "ipc/ipc_channel_handle.h" | |
| 11 #include "ipc/ipc_platform_file.h" | 12 #include "ipc/ipc_platform_file.h" |
| 12 #include "remoting/host/chromoting_param_traits.h" | 13 #include "remoting/host/chromoting_param_traits.h" |
| 13 #include "remoting/host/screen_resolution.h" | 14 #include "remoting/host/screen_resolution.h" |
| 14 #include "remoting/protocol/errors.h" | 15 #include "remoting/protocol/errors.h" |
| 15 #include "remoting/protocol/transport.h" | 16 #include "remoting/protocol/transport.h" |
| 16 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" | 17 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" |
| 17 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" | 18 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
| 18 | 19 |
| 19 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ | 20 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ |
| 20 | 21 |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 46 IPC_MESSAGE_CONTROL2(ChromotingDaemonNetworkMsg_InitializePairingRegistry, | 47 IPC_MESSAGE_CONTROL2(ChromotingDaemonNetworkMsg_InitializePairingRegistry, |
| 47 IPC::PlatformFileForTransit /* privileged_key */, | 48 IPC::PlatformFileForTransit /* privileged_key */, |
| 48 IPC::PlatformFileForTransit /* unprivileged_key */) | 49 IPC::PlatformFileForTransit /* unprivileged_key */) |
| 49 | 50 |
| 50 // Notifies the network process that the terminal |terminal_id| has been | 51 // Notifies the network process that the terminal |terminal_id| has been |
| 51 // disconnected from the desktop session. | 52 // disconnected from the desktop session. |
| 52 IPC_MESSAGE_CONTROL1(ChromotingDaemonNetworkMsg_TerminalDisconnected, | 53 IPC_MESSAGE_CONTROL1(ChromotingDaemonNetworkMsg_TerminalDisconnected, |
| 53 int /* terminal_id */) | 54 int /* terminal_id */) |
| 54 | 55 |
| 55 // Notifies the network process that |terminal_id| is now attached to | 56 // Notifies the network process that |terminal_id| is now attached to |
| 56 // a desktop integration process. |desktop_process| is the handle of the desktop | 57 // a desktop integration process. |desktop_process| is the handle of the desktop |
|
joedow
2016/10/31 16:41:03
Remove |desktop_process| comment since the paramet
Sam McNally
2016/10/31 22:34:27
Done.
| |
| 57 // process. |desktop_pipe| is the client end of the desktop-to-network pipe | 58 // process. |desktop_pipe| is the client end of the desktop-to-network pipe |
| 58 // opened. | 59 // opened. |
| 59 // | 60 IPC_MESSAGE_CONTROL2(ChromotingDaemonNetworkMsg_DesktopAttached, |
| 60 // Windows only: |desktop_pipe| has to be duplicated from the desktop process | |
| 61 // by the receiver of the message. |desktop_process| is already duplicated by | |
| 62 // the sender. | |
| 63 IPC_MESSAGE_CONTROL3(ChromotingDaemonNetworkMsg_DesktopAttached, | |
| 64 int /* terminal_id */, | 61 int /* terminal_id */, |
| 65 base::ProcessHandle /* desktop_process */, | 62 IPC::ChannelHandle /* desktop_pipe */) |
| 66 IPC::PlatformFileForTransit /* desktop_pipe */) | |
| 67 | 63 |
| 68 //----------------------------------------------------------------------------- | 64 //----------------------------------------------------------------------------- |
| 69 // Chromoting messages sent from the network to the daemon process. | 65 // Chromoting messages sent from the network to the daemon process. |
| 70 | 66 |
| 71 // Connects the terminal |terminal_id| (i.e. a remote client) to a desktop | 67 // Connects the terminal |terminal_id| (i.e. a remote client) to a desktop |
| 72 // session. | 68 // session. |
| 73 IPC_MESSAGE_CONTROL3(ChromotingNetworkHostMsg_ConnectTerminal, | 69 IPC_MESSAGE_CONTROL3(ChromotingNetworkHostMsg_ConnectTerminal, |
| 74 int /* terminal_id */, | 70 int /* terminal_id */, |
| 75 remoting::ScreenResolution /* resolution */, | 71 remoting::ScreenResolution /* resolution */, |
| 76 bool /* virtual_terminal */) | 72 bool /* virtual_terminal */) |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 120 std::string /* xmpp_login */) | 116 std::string /* xmpp_login */) |
| 121 | 117 |
| 122 IPC_MESSAGE_CONTROL0(ChromotingNetworkDaemonMsg_HostShutdown) | 118 IPC_MESSAGE_CONTROL0(ChromotingNetworkDaemonMsg_HostShutdown) |
| 123 | 119 |
| 124 //----------------------------------------------------------------------------- | 120 //----------------------------------------------------------------------------- |
| 125 // Chromoting messages sent from the desktop to the daemon process. | 121 // Chromoting messages sent from the desktop to the daemon process. |
| 126 | 122 |
| 127 // Notifies the daemon that a desktop integration process has been initialized. | 123 // Notifies the daemon that a desktop integration process has been initialized. |
| 128 // |desktop_pipe| specifies the client end of the desktop pipe. It is to be | 124 // |desktop_pipe| specifies the client end of the desktop pipe. It is to be |
| 129 // forwarded to the desktop environment stub. | 125 // forwarded to the desktop environment stub. |
| 130 // | |
| 131 // Windows only: |desktop_pipe| has to be duplicated from the desktop process by | |
| 132 // the receiver of the message. | |
| 133 IPC_MESSAGE_CONTROL1(ChromotingDesktopDaemonMsg_DesktopAttached, | 126 IPC_MESSAGE_CONTROL1(ChromotingDesktopDaemonMsg_DesktopAttached, |
| 134 IPC::PlatformFileForTransit /* desktop_pipe */) | 127 IPC::ChannelHandle /* desktop_pipe */) |
| 135 | 128 |
| 136 // Asks the daemon to inject Secure Attention Sequence (SAS) in the session | 129 // Asks the daemon to inject Secure Attention Sequence (SAS) in the session |
| 137 // where the desktop process is running. | 130 // where the desktop process is running. |
| 138 IPC_MESSAGE_CONTROL0(ChromotingDesktopDaemonMsg_InjectSas) | 131 IPC_MESSAGE_CONTROL0(ChromotingDesktopDaemonMsg_InjectSas) |
| 139 | 132 |
| 140 //----------------------------------------------------------------------------- | 133 //----------------------------------------------------------------------------- |
| 141 // Chromoting messages sent from the desktop to the network process. | 134 // Chromoting messages sent from the desktop to the network process. |
| 142 | 135 |
| 143 // Notifies the network process that a shared buffer has been created. | 136 // Notifies the network process that a shared buffer has been created. |
| 144 IPC_MESSAGE_CONTROL3(ChromotingDesktopNetworkMsg_CreateSharedBuffer, | 137 IPC_MESSAGE_CONTROL3(ChromotingDesktopNetworkMsg_CreateSharedBuffer, |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 269 | 262 |
| 270 // The IPC channel path for this remote_security_key connection. This message | 263 // The IPC channel path for this remote_security_key connection. This message |
| 271 // is sent from the well-known IPC server channel. | 264 // is sent from the well-known IPC server channel. |
| 272 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_ConnectionDetails, | 265 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_ConnectionDetails, |
| 273 std::string /* IPC Server path */) | 266 std::string /* IPC Server path */) |
| 274 | 267 |
| 275 // The array of bytes representing a security key response from the remote | 268 // The array of bytes representing a security key response from the remote |
| 276 // client. This message is sent over the per-client IPC channel. | 269 // client. This message is sent over the per-client IPC channel. |
| 277 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_Response, | 270 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_Response, |
| 278 std::string /* response bytes */) | 271 std::string /* response bytes */) |
| OLD | NEW |