| Index: remoting/host/basic_desktop_environment.cc
|
| diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
|
| index 5c1d48d7a0912605a83595510cbcb906c9853513..b3853c9694c5db08854c8908b048d137bf305bfb 100644
|
| --- a/remoting/host/basic_desktop_environment.cc
|
| +++ b/remoting/host/basic_desktop_environment.cc
|
| @@ -56,6 +56,9 @@
|
| }
|
|
|
| std::string BasicDesktopEnvironment::GetCapabilities() const {
|
| + if (supports_touch_events_)
|
| + return protocol::kTouchEventsCapability;
|
| +
|
| return std::string();
|
| }
|
|
|
| @@ -80,13 +83,15 @@
|
| scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
|
| - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
|
| + scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
|
| + bool supports_touch_events)
|
| : caller_task_runner_(caller_task_runner),
|
| video_capture_task_runner_(video_capture_task_runner),
|
| input_task_runner_(input_task_runner),
|
| ui_task_runner_(ui_task_runner),
|
| desktop_capture_options_(new webrtc::DesktopCaptureOptions(
|
| - webrtc::DesktopCaptureOptions::CreateDefault())) {
|
| + webrtc::DesktopCaptureOptions::CreateDefault())),
|
| + supports_touch_events_(supports_touch_events) {
|
| DCHECK(caller_task_runner_->BelongsToCurrentThread());
|
| desktop_capture_options_->set_detect_updated_region(true);
|
| #if defined(USE_X11)
|
| @@ -102,7 +107,8 @@
|
| : caller_task_runner_(caller_task_runner),
|
| video_capture_task_runner_(video_capture_task_runner),
|
| input_task_runner_(input_task_runner),
|
| - ui_task_runner_(ui_task_runner) {}
|
| + ui_task_runner_(ui_task_runner),
|
| + supports_touch_events_(false) {}
|
|
|
| BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {}
|
|
|
|
|