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" |
11 #include "base/process/process_handle.h" | 11 #include "base/process/process_handle.h" |
12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
13 #include "ipc/ipc_sender.h" | 13 #include "ipc/ipc_sender.h" |
14 #include "remoting/host/audio_capturer.h" | 14 #include "remoting/host/audio_capturer.h" |
15 #include "remoting/host/chromoting_messages.h" | 15 #include "remoting/host/chromoting_messages.h" |
16 #include "remoting/host/client_session_control.h" | 16 #include "remoting/host/client_session_control.h" |
17 #include "remoting/host/desktop_session.h" | 17 #include "remoting/host/desktop_session.h" |
18 #include "remoting/host/desktop_session_proxy.h" | 18 #include "remoting/host/desktop_session_proxy.h" |
19 #include "remoting/host/input_injector.h" | 19 #include "remoting/host/input_injector.h" |
20 #include "remoting/host/screen_controls.h" | 20 #include "remoting/host/screen_controls.h" |
| 21 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h" |
21 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" | 22 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" |
22 | 23 |
23 namespace remoting { | 24 namespace remoting { |
24 | 25 |
25 IpcDesktopEnvironment::IpcDesktopEnvironment( | 26 IpcDesktopEnvironment::IpcDesktopEnvironment( |
26 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, | 27 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, |
27 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 28 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
28 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, | 29 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, |
29 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | 30 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
30 base::WeakPtr<ClientSessionControl> client_session_control, | 31 base::WeakPtr<ClientSessionControl> client_session_control, |
(...skipping 18 matching lines...) Expand all Loading... |
49 } | 50 } |
50 | 51 |
51 scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() { | 52 scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() { |
52 return desktop_session_proxy_->CreateInputInjector(); | 53 return desktop_session_proxy_->CreateInputInjector(); |
53 } | 54 } |
54 | 55 |
55 scoped_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() { | 56 scoped_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() { |
56 return desktop_session_proxy_->CreateScreenControls(); | 57 return desktop_session_proxy_->CreateScreenControls(); |
57 } | 58 } |
58 | 59 |
| 60 scoped_ptr<webrtc::MouseCursorMonitor> |
| 61 IpcDesktopEnvironment::CreateMouseCursorMonitor() { |
| 62 return desktop_session_proxy_->CreateMouseCursorMonitor(); |
| 63 } |
| 64 |
59 scoped_ptr<webrtc::ScreenCapturer> | 65 scoped_ptr<webrtc::ScreenCapturer> |
60 IpcDesktopEnvironment::CreateVideoCapturer() { | 66 IpcDesktopEnvironment::CreateVideoCapturer() { |
61 return desktop_session_proxy_->CreateVideoCapturer(); | 67 return desktop_session_proxy_->CreateVideoCapturer(); |
62 } | 68 } |
63 | 69 |
64 std::string IpcDesktopEnvironment::GetCapabilities() const { | 70 std::string IpcDesktopEnvironment::GetCapabilities() const { |
65 return desktop_session_proxy_->GetCapabilities(); | 71 return desktop_session_proxy_->GetCapabilities(); |
66 } | 72 } |
67 | 73 |
68 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) { | 74 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) { |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 if (i != active_connections_.end()) { | 211 if (i != active_connections_.end()) { |
206 DesktopSessionProxy* desktop_session_proxy = i->second; | 212 DesktopSessionProxy* desktop_session_proxy = i->second; |
207 active_connections_.erase(i); | 213 active_connections_.erase(i); |
208 | 214 |
209 // Disconnect the client session. | 215 // Disconnect the client session. |
210 desktop_session_proxy->DisconnectSession(); | 216 desktop_session_proxy->DisconnectSession(); |
211 } | 217 } |
212 } | 218 } |
213 | 219 |
214 } // namespace remoting | 220 } // namespace remoting |
OLD | NEW |