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/win/session_desktop_environment.h" | 5 #include "remoting/host/win/session_desktop_environment.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
9 #include "remoting/host/audio_capturer.h" | 9 #include "remoting/host/audio_capturer.h" |
10 #include "remoting/host/input_injector.h" | 10 #include "remoting/host/input_injector.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 input_injector.Pass(), | 26 input_injector.Pass(), |
27 ui_task_runner(), | 27 ui_task_runner(), |
28 inject_sas_)); | 28 inject_sas_)); |
29 return input_injector.Pass(); | 29 return input_injector.Pass(); |
30 } | 30 } |
31 | 31 |
32 SessionDesktopEnvironment::SessionDesktopEnvironment( | 32 SessionDesktopEnvironment::SessionDesktopEnvironment( |
33 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 33 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
34 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 34 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
35 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 35 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
36 const base::Closure& inject_sas) | 36 const base::Closure& inject_sas, |
| 37 bool supports_touch_events) |
37 : Me2MeDesktopEnvironment(caller_task_runner, | 38 : Me2MeDesktopEnvironment(caller_task_runner, |
38 input_task_runner, | 39 input_task_runner, |
39 ui_task_runner), | 40 ui_task_runner, |
| 41 supports_touch_events), |
40 inject_sas_(inject_sas) { | 42 inject_sas_(inject_sas) { |
41 } | 43 } |
42 | 44 |
43 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( | 45 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( |
44 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 46 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
45 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 47 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
46 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 48 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
47 const base::Closure& inject_sas) | 49 const base::Closure& inject_sas) |
48 : Me2MeDesktopEnvironmentFactory(caller_task_runner, | 50 : Me2MeDesktopEnvironmentFactory(caller_task_runner, |
49 input_task_runner, | 51 input_task_runner, |
50 ui_task_runner), | 52 ui_task_runner), |
51 inject_sas_(inject_sas) { | 53 inject_sas_(inject_sas) { |
52 DCHECK(caller_task_runner->BelongsToCurrentThread()); | 54 DCHECK(caller_task_runner->BelongsToCurrentThread()); |
53 } | 55 } |
54 | 56 |
55 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() { | 57 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() { |
56 } | 58 } |
57 | 59 |
58 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( | 60 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( |
59 base::WeakPtr<ClientSessionControl> client_session_control) { | 61 base::WeakPtr<ClientSessionControl> client_session_control) { |
60 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 62 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
61 | 63 |
62 scoped_ptr<SessionDesktopEnvironment> desktop_environment( | 64 scoped_ptr<SessionDesktopEnvironment> desktop_environment( |
63 new SessionDesktopEnvironment(caller_task_runner(), | 65 new SessionDesktopEnvironment(caller_task_runner(), |
64 input_task_runner(), | 66 input_task_runner(), |
65 ui_task_runner(), | 67 ui_task_runner(), |
66 inject_sas_)); | 68 inject_sas_, |
| 69 supports_touch_events())); |
67 if (!desktop_environment->InitializeSecurity(client_session_control, | 70 if (!desktop_environment->InitializeSecurity(client_session_control, |
68 curtain_enabled())) { | 71 curtain_enabled())) { |
69 return nullptr; | 72 return nullptr; |
70 } | 73 } |
71 | 74 |
72 return desktop_environment.Pass(); | 75 return desktop_environment.Pass(); |
73 } | 76 } |
74 | 77 |
75 } // namespace remoting | 78 } // namespace remoting |
OLD | NEW |