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

Unified Diff: remoting/host/me2me_desktop_environment.cc

Issue 2456563002: Remove supports_touch_events flag from BasicDesktopEnvironment (Closed)
Patch Set: remove test Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/me2me_desktop_environment.h ('k') | remoting/host/remoting_me2me_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/me2me_desktop_environment.cc
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
index 190707f64ce42e91206c11f3382cd37190bf7421..54e78bada279d0822f53235de2fded1b1a15fc0f 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -17,6 +17,7 @@
#include "remoting/host/host_window.h"
#include "remoting/host/host_window.h"
#include "remoting/host/host_window_proxy.h"
+#include "remoting/host/input_injector.h"
#include "remoting/host/local_input_monitor.h"
#include "remoting/host/resizing_host_observer.h"
#include "remoting/host/screen_controls.h"
@@ -49,11 +50,12 @@ Me2MeDesktopEnvironment::CreateScreenControls() {
}
std::string Me2MeDesktopEnvironment::GetCapabilities() const {
- std::string capabilities = BasicDesktopEnvironment::GetCapabilities();
- if (!capabilities.empty())
- capabilities.append(" ");
- capabilities.append(protocol::kRateLimitResizeRequests);
-
+ std::string capabilities;
+ capabilities += protocol::kRateLimitResizeRequests;
+ if (InputInjector::SupportsTouchEvents()) {
+ capabilities += " ";
+ capabilities += protocol::kTouchEventsCapability;
+ }
return capabilities;
}
@@ -61,13 +63,11 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
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,
- bool supports_touch_events)
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
: BasicDesktopEnvironment(caller_task_runner,
video_capture_task_runner,
input_task_runner,
- ui_task_runner,
- supports_touch_events) {
+ ui_task_runner) {
DCHECK(caller_task_runner->BelongsToCurrentThread());
// X DAMAGE is not enabled by default, since it is broken on many systems -
@@ -147,9 +147,9 @@ std::unique_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
DCHECK(caller_task_runner()->BelongsToCurrentThread());
std::unique_ptr<Me2MeDesktopEnvironment> desktop_environment(
- new Me2MeDesktopEnvironment(
- caller_task_runner(), video_capture_task_runner(),
- input_task_runner(), ui_task_runner(), supports_touch_events()));
+ new Me2MeDesktopEnvironment(caller_task_runner(),
+ video_capture_task_runner(),
+ input_task_runner(), ui_task_runner()));
if (!desktop_environment->InitializeSecurity(client_session_control,
curtain_enabled_)) {
return nullptr;
« no previous file with comments | « remoting/host/me2me_desktop_environment.h ('k') | remoting/host/remoting_me2me_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698