| 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/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/process_util.h" | 12 #include "base/process_util.h" |
| 13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 14 #include "ipc/ipc_sender.h" | 14 #include "ipc/ipc_sender.h" |
| 15 #include "media/video/capture/screen/screen_capturer.h" | 15 #include "media/video/capture/screen/screen_capturer.h" |
| 16 #include "remoting/host/audio_capturer.h" | 16 #include "remoting/host/audio_capturer.h" |
| 17 #include "remoting/host/chromoting_messages.h" | 17 #include "remoting/host/chromoting_messages.h" |
| 18 #include "remoting/host/desktop_session_proxy.h" | 18 #include "remoting/host/desktop_session_proxy.h" |
| 19 #include "remoting/host/event_executor.h" | 19 #include "remoting/host/event_executor.h" |
| 20 | 20 |
| 21 namespace remoting { | 21 namespace remoting { |
| 22 | 22 |
| 23 IpcDesktopEnvironment::IpcDesktopEnvironment( | 23 IpcDesktopEnvironment::IpcDesktopEnvironment( |
| 24 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 24 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 25 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | 25 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
| 26 const std::string& client_jid, | 26 const std::string& client_jid, |
| 27 const base::Closure& disconnect_callback, | 27 const base::Closure& disconnect_callback, |
| 28 base::WeakPtr<DesktopSessionConnector> desktop_session_connector) | 28 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, |
| 29 bool curtain_required) |
| 29 : caller_task_runner_(caller_task_runner), | 30 : caller_task_runner_(caller_task_runner), |
| 30 connected_(false), | 31 connected_(false), |
| 31 desktop_session_connector_(desktop_session_connector), | 32 desktop_session_connector_(desktop_session_connector), |
| 32 desktop_session_proxy_(new DesktopSessionProxy(caller_task_runner, | 33 desktop_session_proxy_(new DesktopSessionProxy(caller_task_runner, |
| 33 io_task_runner, | 34 io_task_runner, |
| 34 client_jid, | 35 client_jid, |
| 35 disconnect_callback)) { | 36 disconnect_callback)) { |
| 36 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 37 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 37 } | 38 } |
| 38 | 39 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 desktop_session_connector_->ConnectTerminal(desktop_session_proxy_); | 80 desktop_session_connector_->ConnectTerminal(desktop_session_proxy_); |
| 80 } | 81 } |
| 81 } | 82 } |
| 82 | 83 |
| 83 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( | 84 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( |
| 84 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 85 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 85 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | 86 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
| 86 IPC::Sender* daemon_channel) | 87 IPC::Sender* daemon_channel) |
| 87 : caller_task_runner_(caller_task_runner), | 88 : caller_task_runner_(caller_task_runner), |
| 88 io_task_runner_(io_task_runner), | 89 io_task_runner_(io_task_runner), |
| 90 curtain_activated_(false), |
| 89 daemon_channel_(daemon_channel), | 91 daemon_channel_(daemon_channel), |
| 90 connector_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), | 92 connector_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
| 91 next_id_(0) { | 93 next_id_(0) { |
| 92 } | 94 } |
| 93 | 95 |
| 94 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() { | 96 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() { |
| 95 } | 97 } |
| 96 | 98 |
| 99 void IpcDesktopEnvironmentFactory::SetActivated(bool activated) { |
| 100 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 101 |
| 102 curtain_activated_ = activated; |
| 103 } |
| 104 |
| 97 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( | 105 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( |
| 98 const std::string& client_jid, | 106 const std::string& client_jid, |
| 99 const base::Closure& disconnect_callback) { | 107 const base::Closure& disconnect_callback) { |
| 100 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 108 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 101 | 109 |
| 102 return scoped_ptr<DesktopEnvironment>(new IpcDesktopEnvironment( | 110 return scoped_ptr<DesktopEnvironment>(new IpcDesktopEnvironment( |
| 103 caller_task_runner_, io_task_runner_, client_jid, disconnect_callback, | 111 caller_task_runner_, io_task_runner_, client_jid, disconnect_callback, |
| 104 connector_factory_.GetWeakPtr())); | 112 connector_factory_.GetWeakPtr(), curtain_activated_)); |
| 105 } | 113 } |
| 106 | 114 |
| 107 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const { | 115 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const { |
| 108 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 116 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 109 | 117 |
| 110 return AudioCapturer::IsSupported(); | 118 return AudioCapturer::IsSupported(); |
| 111 } | 119 } |
| 112 | 120 |
| 113 void IpcDesktopEnvironmentFactory::ConnectTerminal( | 121 void IpcDesktopEnvironmentFactory::ConnectTerminal( |
| 114 scoped_refptr<DesktopSessionProxy> desktop_session_proxy) { | 122 scoped_refptr<DesktopSessionProxy> desktop_session_proxy) { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 if (i != active_connections_.end()) { | 188 if (i != active_connections_.end()) { |
| 181 scoped_refptr<DesktopSessionProxy> desktop_session_proxy = i->second; | 189 scoped_refptr<DesktopSessionProxy> desktop_session_proxy = i->second; |
| 182 active_connections_.erase(i); | 190 active_connections_.erase(i); |
| 183 | 191 |
| 184 // Disconnect the client session. | 192 // Disconnect the client session. |
| 185 desktop_session_proxy->DisconnectSession(); | 193 desktop_session_proxy->DisconnectSession(); |
| 186 } | 194 } |
| 187 } | 195 } |
| 188 | 196 |
| 189 } // namespace remoting | 197 } // namespace remoting |
| OLD | NEW |