OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/single_window_desktop_environment.h" | 5 #include "remoting/host/single_window_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/single_window_input_injector.h" | 9 #include "remoting/host/single_window_input_injector.h" |
10 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" | 10 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 // DesktopEnvironment interface. | 21 // DesktopEnvironment interface. |
22 scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; | 22 scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; |
23 scoped_ptr<InputInjector> CreateInputInjector() override; | 23 scoped_ptr<InputInjector> CreateInputInjector() override; |
24 | 24 |
25 protected: | 25 protected: |
26 friend class SingleWindowDesktopEnvironmentFactory; | 26 friend class SingleWindowDesktopEnvironmentFactory; |
27 SingleWindowDesktopEnvironment( | 27 SingleWindowDesktopEnvironment( |
28 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 28 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
29 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 29 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
30 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 30 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
31 webrtc::WindowId window_id); | 31 webrtc::WindowId window_id, |
| 32 bool supports_touch_events); |
32 | 33 |
33 private: | 34 private: |
34 webrtc::WindowId window_id_; | 35 webrtc::WindowId window_id_; |
35 | 36 |
36 DISALLOW_COPY_AND_ASSIGN(SingleWindowDesktopEnvironment); | 37 DISALLOW_COPY_AND_ASSIGN(SingleWindowDesktopEnvironment); |
37 }; | 38 }; |
38 | 39 |
39 SingleWindowDesktopEnvironment::~SingleWindowDesktopEnvironment() { | 40 SingleWindowDesktopEnvironment::~SingleWindowDesktopEnvironment() { |
40 } | 41 } |
41 | 42 |
(...skipping 20 matching lines...) Expand all Loading... |
62 InputInjector::Create(input_task_runner(), | 63 InputInjector::Create(input_task_runner(), |
63 ui_task_runner())); | 64 ui_task_runner())); |
64 return SingleWindowInputInjector::CreateForWindow( | 65 return SingleWindowInputInjector::CreateForWindow( |
65 window_id_, input_injector.Pass()).Pass(); | 66 window_id_, input_injector.Pass()).Pass(); |
66 } | 67 } |
67 | 68 |
68 SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment( | 69 SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment( |
69 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 70 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
70 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 71 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
71 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 72 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
72 webrtc::WindowId window_id) | 73 webrtc::WindowId window_id, |
| 74 bool supports_touch_events) |
73 : BasicDesktopEnvironment(caller_task_runner, | 75 : BasicDesktopEnvironment(caller_task_runner, |
74 input_task_runner, | 76 input_task_runner, |
75 ui_task_runner), | 77 ui_task_runner, |
| 78 supports_touch_events), |
76 window_id_(window_id) { | 79 window_id_(window_id) { |
77 } | 80 } |
78 | 81 |
79 SingleWindowDesktopEnvironmentFactory::SingleWindowDesktopEnvironmentFactory( | 82 SingleWindowDesktopEnvironmentFactory::SingleWindowDesktopEnvironmentFactory( |
80 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 83 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
81 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 84 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
82 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 85 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
83 webrtc::WindowId window_id) | 86 webrtc::WindowId window_id) |
84 : BasicDesktopEnvironmentFactory(caller_task_runner, | 87 : BasicDesktopEnvironmentFactory(caller_task_runner, |
85 input_task_runner, | 88 input_task_runner, |
86 ui_task_runner), | 89 ui_task_runner), |
87 window_id_(window_id) { | 90 window_id_(window_id) { |
88 } | 91 } |
89 | 92 |
90 SingleWindowDesktopEnvironmentFactory:: | 93 SingleWindowDesktopEnvironmentFactory:: |
91 ~SingleWindowDesktopEnvironmentFactory() { | 94 ~SingleWindowDesktopEnvironmentFactory() { |
92 } | 95 } |
93 | 96 |
94 scoped_ptr<DesktopEnvironment> SingleWindowDesktopEnvironmentFactory::Create( | 97 scoped_ptr<DesktopEnvironment> SingleWindowDesktopEnvironmentFactory::Create( |
95 base::WeakPtr<ClientSessionControl> client_session_control) { | 98 base::WeakPtr<ClientSessionControl> client_session_control) { |
96 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 99 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
97 | 100 |
98 scoped_ptr<SingleWindowDesktopEnvironment> desktop_environment( | 101 scoped_ptr<SingleWindowDesktopEnvironment> desktop_environment( |
99 new SingleWindowDesktopEnvironment(caller_task_runner(), | 102 new SingleWindowDesktopEnvironment(caller_task_runner(), |
100 input_task_runner(), | 103 input_task_runner(), |
101 ui_task_runner(), | 104 ui_task_runner(), |
102 window_id_)); | 105 window_id_, |
| 106 supports_touch_events())); |
103 return desktop_environment.Pass(); | 107 return desktop_environment.Pass(); |
104 } | 108 } |
105 | 109 |
106 } // namespace remoting | 110 } // namespace remoting |
OLD | NEW |