| 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/ipc_desktop_environment.h" | 5 #include "remoting/host/ipc_desktop_environment.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" | 24 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" |
| 25 | 25 |
| 26 namespace remoting { | 26 namespace remoting { |
| 27 | 27 |
| 28 IpcDesktopEnvironment::IpcDesktopEnvironment( | 28 IpcDesktopEnvironment::IpcDesktopEnvironment( |
| 29 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, | 29 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, |
| 30 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 30 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 31 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | 31 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
| 32 base::WeakPtr<ClientSessionControl> client_session_control, | 32 base::WeakPtr<ClientSessionControl> client_session_control, |
| 33 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, | 33 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, |
| 34 bool virtual_terminal, | 34 bool virtual_terminal) { |
| 35 bool supports_touch_events) { | |
| 36 DCHECK(caller_task_runner->BelongsToCurrentThread()); | 35 DCHECK(caller_task_runner->BelongsToCurrentThread()); |
| 37 | 36 |
| 38 desktop_session_proxy_ = new DesktopSessionProxy( | 37 desktop_session_proxy_ = new DesktopSessionProxy( |
| 39 audio_task_runner, caller_task_runner, io_task_runner, | 38 audio_task_runner, caller_task_runner, io_task_runner, |
| 40 client_session_control, desktop_session_connector, virtual_terminal, | 39 client_session_control, desktop_session_connector, virtual_terminal); |
| 41 supports_touch_events); | |
| 42 } | 40 } |
| 43 | 41 |
| 44 IpcDesktopEnvironment::~IpcDesktopEnvironment() {} | 42 IpcDesktopEnvironment::~IpcDesktopEnvironment() {} |
| 45 | 43 |
| 46 std::unique_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() { | 44 std::unique_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() { |
| 47 return desktop_session_proxy_->CreateAudioCapturer(); | 45 return desktop_session_proxy_->CreateAudioCapturer(); |
| 48 } | 46 } |
| 49 | 47 |
| 50 std::unique_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() { | 48 std::unique_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() { |
| 51 return desktop_session_proxy_->CreateInputInjector(); | 49 return desktop_session_proxy_->CreateInputInjector(); |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 connector_factory_(this) {} | 87 connector_factory_(this) {} |
| 90 | 88 |
| 91 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {} | 89 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {} |
| 92 | 90 |
| 93 std::unique_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( | 91 std::unique_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( |
| 94 base::WeakPtr<ClientSessionControl> client_session_control) { | 92 base::WeakPtr<ClientSessionControl> client_session_control) { |
| 95 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 93 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 96 | 94 |
| 97 return base::MakeUnique<IpcDesktopEnvironment>( | 95 return base::MakeUnique<IpcDesktopEnvironment>( |
| 98 audio_task_runner_, caller_task_runner_, io_task_runner_, | 96 audio_task_runner_, caller_task_runner_, io_task_runner_, |
| 99 client_session_control, connector_factory_.GetWeakPtr(), curtain_enabled_, | 97 client_session_control, connector_factory_.GetWeakPtr(), |
| 100 supports_touch_events_); | 98 curtain_enabled_); |
| 101 } | 99 } |
| 102 | 100 |
| 103 void IpcDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { | 101 void IpcDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { |
| 104 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 102 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 105 | 103 |
| 106 curtain_enabled_ = enable; | 104 curtain_enabled_ = enable; |
| 107 } | 105 } |
| 108 | 106 |
| 109 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const { | 107 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const { |
| 110 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 108 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 if (i != active_connections_.end()) { | 200 if (i != active_connections_.end()) { |
| 203 DesktopSessionProxy* desktop_session_proxy = i->second; | 201 DesktopSessionProxy* desktop_session_proxy = i->second; |
| 204 active_connections_.erase(i); | 202 active_connections_.erase(i); |
| 205 | 203 |
| 206 // Disconnect the client session. | 204 // Disconnect the client session. |
| 207 desktop_session_proxy->DisconnectSession(protocol::OK); | 205 desktop_session_proxy->DisconnectSession(protocol::OK); |
| 208 } | 206 } |
| 209 } | 207 } |
| 210 | 208 |
| 211 } // namespace remoting | 209 } // namespace remoting |
| OLD | NEW |