| 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/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 It2MeDesktopEnvironment::~It2MeDesktopEnvironment() { | 25 It2MeDesktopEnvironment::~It2MeDesktopEnvironment() { |
| 26 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 26 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 27 } | 27 } |
| 28 | 28 |
| 29 It2MeDesktopEnvironment::It2MeDesktopEnvironment( | 29 It2MeDesktopEnvironment::It2MeDesktopEnvironment( |
| 30 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 30 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 31 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | 31 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
| 32 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 32 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 33 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 33 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 34 base::WeakPtr<ClientSessionControl> client_session_control, | 34 base::WeakPtr<ClientSessionControl> client_session_control, |
| 35 bool supports_touch_events, | |
| 36 bool enable_user_interface) | 35 bool enable_user_interface) |
| 37 : BasicDesktopEnvironment(caller_task_runner, | 36 : BasicDesktopEnvironment(caller_task_runner, |
| 38 video_capture_task_runner, | 37 video_capture_task_runner, |
| 39 input_task_runner, | 38 input_task_runner, |
| 40 ui_task_runner, | 39 ui_task_runner) { |
| 41 supports_touch_events) { | |
| 42 DCHECK(caller_task_runner->BelongsToCurrentThread()); | 40 DCHECK(caller_task_runner->BelongsToCurrentThread()); |
| 43 | 41 |
| 44 // Create the local input monitor. | 42 // Create the local input monitor. |
| 45 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner, | 43 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner, |
| 46 input_task_runner, | 44 input_task_runner, |
| 47 ui_task_runner, | 45 ui_task_runner, |
| 48 client_session_control); | 46 client_session_control); |
| 49 | 47 |
| 50 // The host UI should be created on the UI thread. | 48 // The host UI should be created on the UI thread. |
| 51 #if defined(OS_MACOSX) | 49 #if defined(OS_MACOSX) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 ui_task_runner) {} | 82 ui_task_runner) {} |
| 85 | 83 |
| 86 It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {} | 84 It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {} |
| 87 | 85 |
| 88 std::unique_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( | 86 std::unique_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( |
| 89 base::WeakPtr<ClientSessionControl> client_session_control) { | 87 base::WeakPtr<ClientSessionControl> client_session_control) { |
| 90 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 88 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 91 | 89 |
| 92 return base::WrapUnique(new It2MeDesktopEnvironment( | 90 return base::WrapUnique(new It2MeDesktopEnvironment( |
| 93 caller_task_runner(), video_capture_task_runner(), input_task_runner(), | 91 caller_task_runner(), video_capture_task_runner(), input_task_runner(), |
| 94 ui_task_runner(), client_session_control, supports_touch_events(), | 92 ui_task_runner(), client_session_control, enable_user_interface_)); |
| 95 enable_user_interface_)); | |
| 96 } | 93 } |
| 97 | 94 |
| 98 } // namespace remoting | 95 } // namespace remoting |
| OLD | NEW |