Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: remoting/host/basic_desktop_environment.cc

Issue 1033913003: Touch Events capability negotiation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: back to setting a flag on DesktopEnvironmentFactory Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" 19 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
20 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h" 20 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
21 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" 21 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
22 22
23 namespace remoting { 23 namespace remoting {
24 24
25 namespace {
26 const char kMultiTouchCapability[] = "multiTouch";
27 } // namespace
28
25 BasicDesktopEnvironment::~BasicDesktopEnvironment() { 29 BasicDesktopEnvironment::~BasicDesktopEnvironment() {
26 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 30 DCHECK(caller_task_runner_->BelongsToCurrentThread());
27 } 31 }
28 32
29 scoped_ptr<AudioCapturer> BasicDesktopEnvironment::CreateAudioCapturer() { 33 scoped_ptr<AudioCapturer> BasicDesktopEnvironment::CreateAudioCapturer() {
30 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 34 DCHECK(caller_task_runner_->BelongsToCurrentThread());
31 35
32 return AudioCapturer::Create(); 36 return AudioCapturer::Create();
33 } 37 }
34 38
(...skipping 13 matching lines...) Expand all
48 BasicDesktopEnvironment::CreateMouseCursorMonitor() { 52 BasicDesktopEnvironment::CreateMouseCursorMonitor() {
49 #if defined(OS_CHROMEOS) 53 #if defined(OS_CHROMEOS)
50 return make_scoped_ptr(new MouseCursorMonitorAura()); 54 return make_scoped_ptr(new MouseCursorMonitorAura());
51 #else 55 #else
52 return make_scoped_ptr(webrtc::MouseCursorMonitor::CreateForScreen( 56 return make_scoped_ptr(webrtc::MouseCursorMonitor::CreateForScreen(
53 *desktop_capture_options_, webrtc::kFullDesktopScreenId)); 57 *desktop_capture_options_, webrtc::kFullDesktopScreenId));
54 #endif 58 #endif
55 } 59 }
56 60
57 std::string BasicDesktopEnvironment::GetCapabilities() const { 61 std::string BasicDesktopEnvironment::GetCapabilities() const {
62 if (multi_touch_enabled_)
63 return kMultiTouchCapability;
64
58 return std::string(); 65 return std::string();
59 } 66 }
60 67
61 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { 68 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
62 } 69 }
63 70
64 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler( 71 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler(
65 protocol::ClientStub* client_stub) { 72 protocol::ClientStub* client_stub) {
66 return nullptr; 73 return nullptr;
67 } 74 }
68 75
76 void BasicDesktopEnvironment::SetEnableMultiTouch(bool enable) {
77 multi_touch_enabled_ = enable;
78 }
79
69 scoped_ptr<webrtc::DesktopCapturer> 80 scoped_ptr<webrtc::DesktopCapturer>
70 BasicDesktopEnvironment::CreateVideoCapturer() { 81 BasicDesktopEnvironment::CreateVideoCapturer() {
71 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 82 DCHECK(caller_task_runner_->BelongsToCurrentThread());
72 83
73 #if defined(OS_CHROMEOS) 84 #if defined(OS_CHROMEOS)
74 return scoped_ptr<webrtc::DesktopCapturer>(new AuraDesktopCapturer()); 85 return scoped_ptr<webrtc::DesktopCapturer>(new AuraDesktopCapturer());
75 #else // !defined(OS_CHROMEOS) 86 #else // !defined(OS_CHROMEOS)
76 // The basic desktop environment does not use X DAMAGE, since it is 87 // The basic desktop environment does not use X DAMAGE, since it is
77 // broken on many systems - see http://crbug.com/73423. 88 // broken on many systems - see http://crbug.com/73423.
78 return make_scoped_ptr( 89 return make_scoped_ptr(
79 webrtc::ScreenCapturer::Create(*desktop_capture_options_)); 90 webrtc::ScreenCapturer::Create(*desktop_capture_options_));
80 #endif // !defined(OS_CHROMEOS) 91 #endif // !defined(OS_CHROMEOS)
81 } 92 }
82 93
83 BasicDesktopEnvironment::BasicDesktopEnvironment( 94 BasicDesktopEnvironment::BasicDesktopEnvironment(
84 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 95 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
85 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 96 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
86 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 97 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
87 : caller_task_runner_(caller_task_runner), 98 : caller_task_runner_(caller_task_runner),
88 input_task_runner_(input_task_runner), 99 input_task_runner_(input_task_runner),
89 ui_task_runner_(ui_task_runner), 100 ui_task_runner_(ui_task_runner),
90 desktop_capture_options_( 101 desktop_capture_options_(
91 new webrtc::DesktopCaptureOptions( 102 new webrtc::DesktopCaptureOptions(
92 webrtc::DesktopCaptureOptions::CreateDefault())) { 103 webrtc::DesktopCaptureOptions::CreateDefault())),
104 multi_touch_enabled_(false) {
93 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 105 DCHECK(caller_task_runner_->BelongsToCurrentThread());
94 } 106 }
95 107
96 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( 108 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory(
97 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 109 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
98 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 110 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
99 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 111 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
100 : caller_task_runner_(caller_task_runner), 112 : caller_task_runner_(caller_task_runner),
101 input_task_runner_(input_task_runner), 113 input_task_runner_(input_task_runner),
102 ui_task_runner_(ui_task_runner) { 114 ui_task_runner_(ui_task_runner),
115 multi_touch_enabled_(false) {
103 } 116 }
104 117
105 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() { 118 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {
106 } 119 }
107 120
108 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { 121 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const {
109 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 122 DCHECK(caller_task_runner_->BelongsToCurrentThread());
110 123
111 return AudioCapturer::IsSupported(); 124 return AudioCapturer::IsSupported();
112 } 125 }
113 126
127 void BasicDesktopEnvironmentFactory::SetEnableMultiTouch(bool enable) {
128 multi_touch_enabled_ = enable;
129 }
130
114 } // namespace remoting 131 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698