Index: remoting/host/chromoting_messages.h |
diff --git a/remoting/host/chromoting_messages.h b/remoting/host/chromoting_messages.h |
index 17fdcecadc7231b155672c25bdb7b9f09f1d9f88..71da4e64de5cc75b9f21694e57d58489fe95f719 100644 |
--- a/remoting/host/chromoting_messages.h |
+++ b/remoting/host/chromoting_messages.h |
@@ -6,6 +6,7 @@ |
// Multiply-included message file, no traditional include guard. |
#include "ipc/ipc_message_macros.h" |
+#include "ipc/ipc_platform_file.h" |
#define IPC_MESSAGE_START ChromotingMsgStart |
@@ -29,6 +30,19 @@ IPC_MESSAGE_CONTROL1(ChromotingDaemonNetworkMsg_Configuration, std::string) |
IPC_MESSAGE_CONTROL1(ChromotingDaemonNetworkMsg_TerminalDisconnected, |
int /* terminal_id */) |
+// Notifies the network process that |terminal_id| is now attached to |
+// a desktop integration process. |desktop_process| is the handle of the desktop |
+// process |desktop_pipe| is the client end of the desktop-to-network pipe |
+// opened. |
+// |
+// Windows only: |desktop_pipe| has to be duplicated from the desktop process |
+// by the receiver of the message. |desktop_process| is already duplicated by |
+// the sender. |
+IPC_MESSAGE_CONTROL3(ChromotingDaemonNetworkMsg_DesktopAttached, |
+ int /* terminal_id */, |
+ IPC::PlatformFileForTransit /* desktop_process */, |
+ IPC::PlatformFileForTransit /* desktop_pipe */) |
+ |
//----------------------------------------------------------------------------- |
// Chromoting messages sent from the network to the daemon process. |
@@ -41,3 +55,27 @@ IPC_MESSAGE_CONTROL1(ChromotingNetworkHostMsg_ConnectTerminal, |
// connected to. |
IPC_MESSAGE_CONTROL1(ChromotingNetworkHostMsg_DisconnectTerminal, |
int /* terminal_id */) |
+ |
+//----------------------------------------------------------------------------- |
+// Chromoting messages sent from the daemon to the desktop process. |
+ |
+// Requests the desktop process to crash producing a crash dump. The daemon |
+// sends this message when a fatal error has been detected indicating that |
+// the desktop process misbehaves. The daemon passes the location of the code |
+// that detected the error. |
+IPC_MESSAGE_CONTROL3(ChromotingDaemonDesktopMsg_Crash, |
+ std::string /* function_name */, |
+ std::string /* file_name */, |
+ int /* line_number */) |
+ |
+//----------------------------------------------------------------------------- |
+// Chromoting messages sent from the desktop to the daemon process. |
+ |
+// Notifies the daemon that a desktop integration process has been initialized. |
+// |desktop_pipe| specifies the client end of the desktop pipe. It is to be |
+// forwarded to the desktop environment stub. |
+// |
+// Windows only: |desktop_pipe| has to be duplicated from the desktop process by |
+// the receiver of the message. |
+IPC_MESSAGE_CONTROL1(ChromotingDesktopDaemonMsg_DesktopAttached, |
+ IPC::PlatformFileForTransit /* desktop_pipe */) |