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 #include "remoting/host/desktop_session_proxy.h" | 5 #include "remoting/host/desktop_session_proxy.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/platform_file.h" | 9 #include "base/platform_file.h" |
10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 base::CloseProcessHandle(desktop_process); | 136 base::CloseProcessHandle(desktop_process); |
137 return false; | 137 return false; |
138 } | 138 } |
139 | 139 |
140 IPC::ChannelHandle desktop_channel_handle(pipe); | 140 IPC::ChannelHandle desktop_channel_handle(pipe); |
141 | 141 |
142 #elif defined(OS_POSIX) | 142 #elif defined(OS_POSIX) |
143 // On posix: |desktop_pipe| is a valid file descriptor. | 143 // On posix: |desktop_pipe| is a valid file descriptor. |
144 DCHECK(desktop_pipe.auto_close); | 144 DCHECK(desktop_pipe.auto_close); |
145 | 145 |
146 IPC::ChannelHandle desktop_channel_handle("", desktop_pipe); | 146 IPC::ChannelHandle desktop_channel_handle(std::string(), desktop_pipe); |
147 | 147 |
148 #else | 148 #else |
149 #error Unsupported platform. | 149 #error Unsupported platform. |
150 #endif | 150 #endif |
151 | 151 |
152 // Connect to the desktop process. | 152 // Connect to the desktop process. |
153 desktop_channel_.reset(new IPC::ChannelProxy(desktop_channel_handle, | 153 desktop_channel_.reset(new IPC::ChannelProxy(desktop_channel_handle, |
154 IPC::Channel::MODE_CLIENT, | 154 IPC::Channel::MODE_CLIENT, |
155 this, | 155 this, |
156 io_task_runner_)); | 156 io_task_runner_)); |
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 } | 487 } |
488 | 488 |
489 // static | 489 // static |
490 void DesktopSessionProxyTraits::Destruct( | 490 void DesktopSessionProxyTraits::Destruct( |
491 const DesktopSessionProxy* desktop_session_proxy) { | 491 const DesktopSessionProxy* desktop_session_proxy) { |
492 desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE, | 492 desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE, |
493 desktop_session_proxy); | 493 desktop_session_proxy); |
494 } | 494 } |
495 | 495 |
496 } // namespace remoting | 496 } // namespace remoting |
OLD | NEW |