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/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
11 #include "build/build_config.h" | 12 #include "build/build_config.h" |
12 #include "remoting/host/client_session_control.h" | 13 #include "remoting/host/client_session_control.h" |
13 #include "remoting/host/host_window.h" | 14 #include "remoting/host/host_window.h" |
14 #include "remoting/host/host_window_proxy.h" | 15 #include "remoting/host/host_window_proxy.h" |
15 #include "remoting/host/local_input_monitor.h" | 16 #include "remoting/host/local_input_monitor.h" |
16 | 17 |
17 #if defined(OS_POSIX) | 18 #if defined(OS_POSIX) |
18 #include <sys/types.h> | 19 #include <sys/types.h> |
19 #include <unistd.h> | 20 #include <unistd.h> |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | 78 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
78 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 79 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
79 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 80 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
80 : BasicDesktopEnvironmentFactory(caller_task_runner, | 81 : BasicDesktopEnvironmentFactory(caller_task_runner, |
81 video_capture_task_runner, | 82 video_capture_task_runner, |
82 input_task_runner, | 83 input_task_runner, |
83 ui_task_runner) {} | 84 ui_task_runner) {} |
84 | 85 |
85 It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {} | 86 It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {} |
86 | 87 |
87 scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( | 88 std::unique_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( |
88 base::WeakPtr<ClientSessionControl> client_session_control) { | 89 base::WeakPtr<ClientSessionControl> client_session_control) { |
89 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 90 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
90 | 91 |
91 return make_scoped_ptr(new It2MeDesktopEnvironment( | 92 return base::WrapUnique(new It2MeDesktopEnvironment( |
92 caller_task_runner(), video_capture_task_runner(), input_task_runner(), | 93 caller_task_runner(), video_capture_task_runner(), input_task_runner(), |
93 ui_task_runner(), client_session_control, supports_touch_events())); | 94 ui_task_runner(), client_session_control, supports_touch_events())); |
94 } | 95 } |
95 | 96 |
96 } // namespace remoting | 97 } // namespace remoting |
OLD | NEW |