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/basic_desktop_environment.h" | 5 #include "remoting/host/basic_desktop_environment.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "remoting/host/audio_capturer.h" | 10 #include "remoting/host/audio_capturer.h" |
11 #if defined(OS_CHROMEOS) | 11 #if defined(OS_CHROMEOS) |
12 #include "remoting/host/chromeos/aura_desktop_capturer.h" | 12 #include "remoting/host/chromeos/aura_desktop_capturer.h" |
13 #include "remoting/host/chromeos/mouse_cursor_monitor_aura.h" | 13 #include "remoting/host/chromeos/mouse_cursor_monitor_aura.h" |
14 #endif | 14 #endif |
15 #include "remoting/host/client_session_control.h" | 15 #include "remoting/host/client_session_control.h" |
16 #include "remoting/host/gnubby_auth_handler.h" | 16 #include "remoting/host/gnubby_auth_handler.h" |
17 #include "remoting/host/input_injector.h" | 17 #include "remoting/host/input_injector.h" |
18 #include "remoting/host/screen_controls.h" | 18 #include "remoting/host/screen_controls.h" |
| 19 #include "remoting/protocol/capability_names.h" |
19 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" | 20 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" |
20 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h" | 21 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h" |
21 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" | 22 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" |
22 | 23 |
23 namespace remoting { | 24 namespace remoting { |
24 | 25 |
25 BasicDesktopEnvironment::~BasicDesktopEnvironment() { | 26 BasicDesktopEnvironment::~BasicDesktopEnvironment() { |
26 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 27 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
27 } | 28 } |
28 | 29 |
(...skipping 19 matching lines...) Expand all Loading... |
48 BasicDesktopEnvironment::CreateMouseCursorMonitor() { | 49 BasicDesktopEnvironment::CreateMouseCursorMonitor() { |
49 #if defined(OS_CHROMEOS) | 50 #if defined(OS_CHROMEOS) |
50 return make_scoped_ptr(new MouseCursorMonitorAura()); | 51 return make_scoped_ptr(new MouseCursorMonitorAura()); |
51 #else | 52 #else |
52 return make_scoped_ptr(webrtc::MouseCursorMonitor::CreateForScreen( | 53 return make_scoped_ptr(webrtc::MouseCursorMonitor::CreateForScreen( |
53 *desktop_capture_options_, webrtc::kFullDesktopScreenId)); | 54 *desktop_capture_options_, webrtc::kFullDesktopScreenId)); |
54 #endif | 55 #endif |
55 } | 56 } |
56 | 57 |
57 std::string BasicDesktopEnvironment::GetCapabilities() const { | 58 std::string BasicDesktopEnvironment::GetCapabilities() const { |
| 59 if (supports_touch_events_) |
| 60 return protocol::kTouchEventsCapability; |
| 61 |
58 return std::string(); | 62 return std::string(); |
59 } | 63 } |
60 | 64 |
61 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { | 65 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { |
62 } | 66 } |
63 | 67 |
64 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler( | 68 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler( |
65 protocol::ClientStub* client_stub) { | 69 protocol::ClientStub* client_stub) { |
66 return nullptr; | 70 return nullptr; |
67 } | 71 } |
68 | 72 |
69 scoped_ptr<webrtc::DesktopCapturer> | 73 scoped_ptr<webrtc::DesktopCapturer> |
70 BasicDesktopEnvironment::CreateVideoCapturer() { | 74 BasicDesktopEnvironment::CreateVideoCapturer() { |
71 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 75 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
72 | 76 |
73 #if defined(OS_CHROMEOS) | 77 #if defined(OS_CHROMEOS) |
74 return scoped_ptr<webrtc::DesktopCapturer>(new AuraDesktopCapturer()); | 78 return scoped_ptr<webrtc::DesktopCapturer>(new AuraDesktopCapturer()); |
75 #else // !defined(OS_CHROMEOS) | 79 #else // !defined(OS_CHROMEOS) |
76 // The basic desktop environment does not use X DAMAGE, since it is | 80 // The basic desktop environment does not use X DAMAGE, since it is |
77 // broken on many systems - see http://crbug.com/73423. | 81 // broken on many systems - see http://crbug.com/73423. |
78 return make_scoped_ptr( | 82 return make_scoped_ptr( |
79 webrtc::ScreenCapturer::Create(*desktop_capture_options_)); | 83 webrtc::ScreenCapturer::Create(*desktop_capture_options_)); |
80 #endif // !defined(OS_CHROMEOS) | 84 #endif // !defined(OS_CHROMEOS) |
81 } | 85 } |
82 | 86 |
83 BasicDesktopEnvironment::BasicDesktopEnvironment( | 87 BasicDesktopEnvironment::BasicDesktopEnvironment( |
84 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 88 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
85 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 89 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
86 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 90 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 91 bool supports_touch_events) |
87 : caller_task_runner_(caller_task_runner), | 92 : caller_task_runner_(caller_task_runner), |
88 input_task_runner_(input_task_runner), | 93 input_task_runner_(input_task_runner), |
89 ui_task_runner_(ui_task_runner), | 94 ui_task_runner_(ui_task_runner), |
90 desktop_capture_options_( | 95 desktop_capture_options_( |
91 new webrtc::DesktopCaptureOptions( | 96 new webrtc::DesktopCaptureOptions( |
92 webrtc::DesktopCaptureOptions::CreateDefault())) { | 97 webrtc::DesktopCaptureOptions::CreateDefault())), |
| 98 supports_touch_events_(supports_touch_events) { |
93 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 99 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
94 } | 100 } |
95 | 101 |
96 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( | 102 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( |
97 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 103 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
98 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 104 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
99 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 105 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
100 : caller_task_runner_(caller_task_runner), | 106 : caller_task_runner_(caller_task_runner), |
101 input_task_runner_(input_task_runner), | 107 input_task_runner_(input_task_runner), |
102 ui_task_runner_(ui_task_runner) { | 108 ui_task_runner_(ui_task_runner), |
| 109 supports_touch_events_(false) { |
103 } | 110 } |
104 | 111 |
105 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() { | 112 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() { |
106 } | 113 } |
107 | 114 |
108 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { | 115 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { |
109 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 116 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
110 | 117 |
111 return AudioCapturer::IsSupported(); | 118 return AudioCapturer::IsSupported(); |
112 } | 119 } |
113 | 120 |
114 } // namespace remoting | 121 } // namespace remoting |
OLD | NEW |