Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1107)

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 11231060: [Chromoting] The desktop process now creates a pre-connected pipe and passes (with some help of the… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixup Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 420465c91656600f1db2d6e386c9980819c159c7..7d49080ee0c0f74cf3cb68a8908f415d7a0e636e 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -309,6 +309,10 @@ class HostProcess
OnCrash)
IPC_MESSAGE_HANDLER(ChromotingDaemonNetworkMsg_Configuration,
OnConfigUpdated)
+ IPC_MESSAGE_FORWARD(
+ ChromotingDaemonNetworkMsg_DesktopAttached,
+ desktop_session_connector_,
+ DesktopSessionConnector::OnDesktopSessionAgentAttached)
IPC_MESSAGE_FORWARD(ChromotingDaemonNetworkMsg_TerminalDisconnected,
desktop_session_connector_,
DesktopSessionConnector::OnTerminalDisconnected)
@@ -320,6 +324,16 @@ class HostProcess
#endif // !defined(REMOTING_MULTI_PROCESS)
}
+ // Shutdown the host if the daemon disconnected the channel.
+ virtual void OnChannelError() OVERRIDE {
+ DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());
+
+ context_->network_task_runner()->PostTask(
+ FROM_HERE,
+ base::Bind(&HostProcess::Shutdown, base::Unretained(this),
+ kSuccessExitCode));
+ }
+
void StartHostProcess() {
DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());

Powered by Google App Engine
This is Rietveld 408576698