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

Unified Diff: remoting/host/me2me_desktop_environment.cc

Issue 1033913003: Touch Events capability negotiation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: remoting/host/me2me_desktop_environment.cc
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
index d61beb2bbe8555139f0c7c408938a5553dcf241b..64d743d096b30433f8dee0ddbf9d6e54ae0af942 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -15,6 +15,7 @@
#include "remoting/host/host_window.h"
#include "remoting/host/host_window_proxy.h"
#include "remoting/host/local_input_monitor.h"
+#include "remoting/host/multi_touch_capability.h"
#include "remoting/host/resizing_host_observer.h"
#include "remoting/host/screen_controls.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
@@ -40,7 +41,12 @@ scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() {
}
std::string Me2MeDesktopEnvironment::GetCapabilities() const {
- return kRateLimitResizeRequests;
+ std::string result = kRateLimitResizeRequests;
+
+ if (multi_touch_enabled())
+ result = result + " " + kMultiTouchCapability;
+
+ return result;
}
Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
@@ -149,6 +155,7 @@ scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
return nullptr;
}
desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_);
+ desktop_environment->SetEnableMultiTouch(multi_touch_enabled());
return desktop_environment.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698