OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/it2me_desktop_environment.h" | 5 #include "remoting/host/it2me_desktop_environment.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "remoting/host/client_session_control.h" | 12 #include "remoting/host/client_session_control.h" |
13 #include "remoting/host/host_window.h" | 13 #include "remoting/host/host_window.h" |
14 #include "remoting/host/host_window_proxy.h" | 14 #include "remoting/host/host_window_proxy.h" |
15 #include "remoting/host/local_input_monitor.h" | 15 #include "remoting/host/local_input_monitor.h" |
16 | 16 |
17 #if defined(OS_POSIX) | 17 #if defined(OS_POSIX) |
18 #include <sys/types.h> | 18 #include <sys/types.h> |
19 #include <unistd.h> | 19 #include <unistd.h> |
20 #endif // defined(OS_POSIX) | 20 #endif // defined(OS_POSIX) |
21 | 21 |
22 namespace remoting { | 22 namespace remoting { |
23 | 23 |
24 It2MeDesktopEnvironment::~It2MeDesktopEnvironment() { | 24 It2MeDesktopEnvironment::~It2MeDesktopEnvironment() { |
25 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 25 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
26 } | 26 } |
27 | 27 |
28 It2MeDesktopEnvironment::It2MeDesktopEnvironment( | 28 It2MeDesktopEnvironment::It2MeDesktopEnvironment( |
29 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 29 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 30 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
30 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 31 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
31 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 32 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
32 base::WeakPtr<ClientSessionControl> client_session_control, | 33 base::WeakPtr<ClientSessionControl> client_session_control, |
33 bool supports_touch_events) | 34 bool supports_touch_events) |
34 : BasicDesktopEnvironment(caller_task_runner, | 35 : BasicDesktopEnvironment(caller_task_runner, |
| 36 video_capture_task_runner, |
35 input_task_runner, | 37 input_task_runner, |
36 ui_task_runner, | 38 ui_task_runner, |
37 supports_touch_events) { | 39 supports_touch_events) { |
38 DCHECK(caller_task_runner->BelongsToCurrentThread()); | 40 DCHECK(caller_task_runner->BelongsToCurrentThread()); |
39 | 41 |
40 // Create the local input monitor. | 42 // Create the local input monitor. |
41 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner, | 43 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner, |
42 input_task_runner, | 44 input_task_runner, |
43 ui_task_runner, | 45 ui_task_runner, |
44 client_session_control); | 46 client_session_control); |
(...skipping 20 matching lines...) Expand all Loading... |
65 | 67 |
66 disconnect_window_ = HostWindow::CreateDisconnectWindow(); | 68 disconnect_window_ = HostWindow::CreateDisconnectWindow(); |
67 disconnect_window_.reset(new HostWindowProxy( | 69 disconnect_window_.reset(new HostWindowProxy( |
68 caller_task_runner, ui_task_runner, std::move(disconnect_window_))); | 70 caller_task_runner, ui_task_runner, std::move(disconnect_window_))); |
69 disconnect_window_->Start(client_session_control); | 71 disconnect_window_->Start(client_session_control); |
70 } | 72 } |
71 } | 73 } |
72 | 74 |
73 It2MeDesktopEnvironmentFactory::It2MeDesktopEnvironmentFactory( | 75 It2MeDesktopEnvironmentFactory::It2MeDesktopEnvironmentFactory( |
74 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 76 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 77 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
75 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 78 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
76 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 79 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
77 : BasicDesktopEnvironmentFactory(caller_task_runner, | 80 : BasicDesktopEnvironmentFactory(caller_task_runner, |
| 81 video_capture_task_runner, |
78 input_task_runner, | 82 input_task_runner, |
79 ui_task_runner) { | 83 ui_task_runner) {} |
80 } | |
81 | 84 |
82 It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() { | 85 It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {} |
83 } | |
84 | 86 |
85 scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( | 87 scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( |
86 base::WeakPtr<ClientSessionControl> client_session_control) { | 88 base::WeakPtr<ClientSessionControl> client_session_control) { |
87 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 89 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
88 | 90 |
89 return make_scoped_ptr(new It2MeDesktopEnvironment(caller_task_runner(), | 91 return make_scoped_ptr(new It2MeDesktopEnvironment( |
90 input_task_runner(), | 92 caller_task_runner(), video_capture_task_runner(), input_task_runner(), |
91 ui_task_runner(), | 93 ui_task_runner(), client_session_control, supports_touch_events())); |
92 client_session_control, | |
93 supports_touch_events())); | |
94 } | 94 } |
95 | 95 |
96 } // namespace remoting | 96 } // namespace remoting |
OLD | NEW |