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

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

Issue 2456563002: Remove supports_touch_events flag from BasicDesktopEnvironment (Closed)
Patch Set: remove test Created 4 years, 1 month 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
« no previous file with comments | « remoting/host/basic_desktop_environment.h ('k') | remoting/host/desktop_session_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 return nullptr; 49 return nullptr;
50 } 50 }
51 51
52 std::unique_ptr<webrtc::MouseCursorMonitor> 52 std::unique_ptr<webrtc::MouseCursorMonitor>
53 BasicDesktopEnvironment::CreateMouseCursorMonitor() { 53 BasicDesktopEnvironment::CreateMouseCursorMonitor() {
54 return base::MakeUnique<MouseCursorMonitorProxy>(video_capture_task_runner_, 54 return base::MakeUnique<MouseCursorMonitorProxy>(video_capture_task_runner_,
55 *desktop_capture_options_); 55 *desktop_capture_options_);
56 } 56 }
57 57
58 std::string BasicDesktopEnvironment::GetCapabilities() const { 58 std::string BasicDesktopEnvironment::GetCapabilities() const {
59 if (supports_touch_events_)
60 return protocol::kTouchEventsCapability;
61
62 return std::string(); 59 return std::string();
63 } 60 }
64 61
65 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { 62 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
66 } 63 }
67 64
68 uint32_t BasicDesktopEnvironment::GetDesktopSessionId() const { 65 uint32_t BasicDesktopEnvironment::GetDesktopSessionId() const {
69 return UINT32_MAX; 66 return UINT32_MAX;
70 } 67 }
71 68
72 std::unique_ptr<webrtc::DesktopCapturer> 69 std::unique_ptr<webrtc::DesktopCapturer>
73 BasicDesktopEnvironment::CreateVideoCapturer() { 70 BasicDesktopEnvironment::CreateVideoCapturer() {
74 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 71 DCHECK(caller_task_runner_->BelongsToCurrentThread());
75 72
76 std::unique_ptr<DesktopCapturerProxy> result( 73 std::unique_ptr<DesktopCapturerProxy> result(
77 new DesktopCapturerProxy(video_capture_task_runner_)); 74 new DesktopCapturerProxy(video_capture_task_runner_));
78 result->CreateCapturer(*desktop_capture_options_); 75 result->CreateCapturer(*desktop_capture_options_);
79 return std::move(result); 76 return std::move(result);
80 } 77 }
81 78
82 BasicDesktopEnvironment::BasicDesktopEnvironment( 79 BasicDesktopEnvironment::BasicDesktopEnvironment(
83 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 80 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
84 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 81 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
85 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 82 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
86 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 83 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
87 bool supports_touch_events)
88 : caller_task_runner_(caller_task_runner), 84 : caller_task_runner_(caller_task_runner),
89 video_capture_task_runner_(video_capture_task_runner), 85 video_capture_task_runner_(video_capture_task_runner),
90 input_task_runner_(input_task_runner), 86 input_task_runner_(input_task_runner),
91 ui_task_runner_(ui_task_runner), 87 ui_task_runner_(ui_task_runner),
92 desktop_capture_options_(new webrtc::DesktopCaptureOptions( 88 desktop_capture_options_(new webrtc::DesktopCaptureOptions(
93 webrtc::DesktopCaptureOptions::CreateDefault())), 89 webrtc::DesktopCaptureOptions::CreateDefault())) {
94 supports_touch_events_(supports_touch_events) {
95 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 90 DCHECK(caller_task_runner_->BelongsToCurrentThread());
96 desktop_capture_options_->set_detect_updated_region(true); 91 desktop_capture_options_->set_detect_updated_region(true);
97 #if defined(USE_X11) 92 #if defined(USE_X11)
98 IgnoreXServerGrabs(desktop_capture_options_->x_display()->display(), true); 93 IgnoreXServerGrabs(desktop_capture_options_->x_display()->display(), true);
99 #endif 94 #endif
100 } 95 }
101 96
102 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( 97 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory(
103 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 98 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
104 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 99 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
105 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 100 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
106 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 101 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
107 : caller_task_runner_(caller_task_runner), 102 : caller_task_runner_(caller_task_runner),
108 video_capture_task_runner_(video_capture_task_runner), 103 video_capture_task_runner_(video_capture_task_runner),
109 input_task_runner_(input_task_runner), 104 input_task_runner_(input_task_runner),
110 ui_task_runner_(ui_task_runner), 105 ui_task_runner_(ui_task_runner) {}
111 supports_touch_events_(false) {}
112 106
113 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {} 107 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {}
114 108
115 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { 109 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const {
116 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 110 DCHECK(caller_task_runner_->BelongsToCurrentThread());
117 111
118 return AudioCapturer::IsSupported(); 112 return AudioCapturer::IsSupported();
119 } 113 }
120 114
121 } // namespace remoting 115 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/basic_desktop_environment.h ('k') | remoting/host/desktop_session_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698