| Index: remoting/host/ipc_desktop_environment.cc
|
| diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc
|
| index 9cafaf932a1e3f28706f01d9a844942330a2b619..f4f9c006d72a29bd72570d3171deb49146892113 100644
|
| --- a/remoting/host/ipc_desktop_environment.cc
|
| +++ b/remoting/host/ipc_desktop_environment.cc
|
| @@ -166,19 +166,21 @@ void IpcDesktopEnvironmentFactory::SetScreenResolution(
|
|
|
| void IpcDesktopEnvironmentFactory::OnDesktopSessionAgentAttached(
|
| int terminal_id,
|
| + int session_id,
|
| const IPC::ChannelHandle& desktop_pipe) {
|
| if (!caller_task_runner_->BelongsToCurrentThread()) {
|
| caller_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&IpcDesktopEnvironmentFactory::OnDesktopSessionAgentAttached,
|
| - base::Unretained(this), terminal_id, desktop_pipe));
|
| + base::Unretained(this), terminal_id, session_id,
|
| + desktop_pipe));
|
| return;
|
| }
|
|
|
| ActiveConnectionsList::iterator i = active_connections_.find(terminal_id);
|
| if (i != active_connections_.end()) {
|
| i->second->DetachFromDesktop();
|
| - i->second->AttachToDesktop(desktop_pipe);
|
| + i->second->AttachToDesktop(desktop_pipe, session_id);
|
| } else {
|
| mojo::ScopedMessagePipeHandle closer(desktop_pipe.mojo_handle);
|
| }
|
|
|