| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 } | 66 } |
| 67 | 67 |
| 68 std::string IpcDesktopEnvironment::GetCapabilities() const { | 68 std::string IpcDesktopEnvironment::GetCapabilities() const { |
| 69 return desktop_session_proxy_->GetCapabilities(); | 69 return desktop_session_proxy_->GetCapabilities(); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) { | 72 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) { |
| 73 return desktop_session_proxy_->SetCapabilities(capabilities); | 73 return desktop_session_proxy_->SetCapabilities(capabilities); |
| 74 } | 74 } |
| 75 | 75 |
| 76 uint32_t IpcDesktopEnvironment::GetDesktopSessionId() const { |
| 77 return desktop_session_proxy_->desktop_session_id(); |
| 78 } |
| 79 |
| 76 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( | 80 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( |
| 77 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, | 81 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, |
| 78 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 82 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 79 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | 83 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
| 80 IPC::Sender* daemon_channel) | 84 IPC::Sender* daemon_channel) |
| 81 : audio_task_runner_(audio_task_runner), | 85 : audio_task_runner_(audio_task_runner), |
| 82 caller_task_runner_(caller_task_runner), | 86 caller_task_runner_(caller_task_runner), |
| 83 io_task_runner_(io_task_runner), | 87 io_task_runner_(io_task_runner), |
| 84 daemon_channel_(daemon_channel), | 88 daemon_channel_(daemon_channel), |
| 85 connector_factory_(this) {} | 89 connector_factory_(this) {} |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 if (i != active_connections_.end()) { | 202 if (i != active_connections_.end()) { |
| 199 DesktopSessionProxy* desktop_session_proxy = i->second; | 203 DesktopSessionProxy* desktop_session_proxy = i->second; |
| 200 active_connections_.erase(i); | 204 active_connections_.erase(i); |
| 201 | 205 |
| 202 // Disconnect the client session. | 206 // Disconnect the client session. |
| 203 desktop_session_proxy->DisconnectSession(protocol::OK); | 207 desktop_session_proxy->DisconnectSession(protocol::OK); |
| 204 } | 208 } |
| 205 } | 209 } |
| 206 | 210 |
| 207 } // namespace remoting | 211 } // namespace remoting |
| OLD | NEW |