| 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" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "ipc/ipc_channel_proxy.h" | 12 #include "ipc/ipc_channel_proxy.h" |
| 13 #include "ipc/ipc_message_macros.h" | 13 #include "ipc/ipc_message_macros.h" |
| 14 #include "media/video/capture/screen/screen_capture_data.h" | 14 #include "media/video/capture/screen/screen_capture_data.h" |
| 15 #include "remoting/host/chromoting_messages.h" | 15 #include "remoting/host/chromoting_messages.h" |
| 16 #include "remoting/host/client_session.h" | 16 #include "remoting/host/client_session.h" |
| 17 #include "remoting/host/desktop_session_connector.h" | 17 #include "remoting/host/desktop_session_connector.h" |
| 18 #include "remoting/host/ipc_audio_capturer.h" | 18 #include "remoting/host/ipc_audio_capturer.h" |
| 19 #include "remoting/host/ipc_event_executor.h" | 19 #include "remoting/host/ipc_event_executor.h" |
| 20 #include "remoting/host/ipc_session_controller.h" | 20 #include "remoting/host/ipc_session_controller.h" |
| 21 #include "remoting/host/ipc_video_frame_capturer.h" | 21 #include "remoting/host/ipc_video_frame_capturer.h" |
| 22 #include "remoting/host/screen_resolution.h" |
| 22 #include "remoting/host/session_controller.h" | 23 #include "remoting/host/session_controller.h" |
| 23 #include "remoting/proto/audio.pb.h" | 24 #include "remoting/proto/audio.pb.h" |
| 24 #include "remoting/proto/control.pb.h" | 25 #include "remoting/proto/control.pb.h" |
| 25 #include "remoting/proto/event.pb.h" | 26 #include "remoting/proto/event.pb.h" |
| 26 | 27 |
| 27 #if defined(OS_WIN) | 28 #if defined(OS_WIN) |
| 28 #include "base/win/scoped_handle.h" | 29 #include "base/win/scoped_handle.h" |
| 29 #endif // defined(OS_WIN) | 30 #endif // defined(OS_WIN) |
| 30 | 31 |
| 31 namespace remoting { | 32 namespace remoting { |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 | 282 |
| 282 void DesktopSessionProxy::ConnectToDesktopSession( | 283 void DesktopSessionProxy::ConnectToDesktopSession( |
| 283 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, | 284 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, |
| 284 bool virtual_terminal) { | 285 bool virtual_terminal) { |
| 285 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 286 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 286 DCHECK(!desktop_session_connector_); | 287 DCHECK(!desktop_session_connector_); |
| 287 DCHECK(desktop_session_connector); | 288 DCHECK(desktop_session_connector); |
| 288 | 289 |
| 289 desktop_session_connector_ = desktop_session_connector; | 290 desktop_session_connector_ = desktop_session_connector; |
| 290 desktop_session_connector_->ConnectTerminal( | 291 desktop_session_connector_->ConnectTerminal( |
| 291 this, DesktopSessionParams(), virtual_terminal); | 292 this, ScreenResolution(), virtual_terminal); |
| 292 } | 293 } |
| 293 | 294 |
| 294 DesktopSessionProxy::~DesktopSessionProxy() { | 295 DesktopSessionProxy::~DesktopSessionProxy() { |
| 295 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 296 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 296 | 297 |
| 297 if (desktop_session_connector_) | 298 if (desktop_session_connector_) |
| 298 desktop_session_connector_->DisconnectTerminal(this); | 299 desktop_session_connector_->DisconnectTerminal(this); |
| 299 | 300 |
| 300 if (desktop_process_ != base::kNullProcessHandle) { | 301 if (desktop_process_ != base::kNullProcessHandle) { |
| 301 base::CloseProcessHandle(desktop_process_); | 302 base::CloseProcessHandle(desktop_process_); |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 } | 465 } |
| 465 | 466 |
| 466 // static | 467 // static |
| 467 void DesktopSessionProxyTraits::Destruct( | 468 void DesktopSessionProxyTraits::Destruct( |
| 468 const DesktopSessionProxy* desktop_session_proxy) { | 469 const DesktopSessionProxy* desktop_session_proxy) { |
| 469 desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE, | 470 desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE, |
| 470 desktop_session_proxy); | 471 desktop_session_proxy); |
| 471 } | 472 } |
| 472 | 473 |
| 473 } // namespace remoting | 474 } // namespace remoting |
| OLD | NEW |