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

Unified Diff: remoting/host/desktop_session_proxy.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 side-by-side diff with in-line comments
Download patch
Index: remoting/host/desktop_session_proxy.cc
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc
index 7d1fc7e4f0ecd63a1802e427d059152c768306e6..69545ae16ab9ef1b3e217e2566d81d983f5c8ed0 100644
--- a/remoting/host/desktop_session_proxy.cc
+++ b/remoting/host/desktop_session_proxy.cc
@@ -36,6 +36,7 @@
const bool kReadOnly = true;
const char kSendInitialResolution[] = "sendInitialResolution";
const char kRateLimitResizeRequests[] = "rateLimitResizeRequests";
+const char kMultiTouchCapability[] = "multiTouch";
namespace remoting {
@@ -107,7 +108,8 @@ DesktopSessionProxy::DesktopSessionProxy(
scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
base::WeakPtr<ClientSessionControl> client_session_control,
base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
- bool virtual_terminal)
+ bool virtual_terminal,
+ bool multi_touch_enabled)
: audio_capture_task_runner_(audio_capture_task_runner),
caller_task_runner_(caller_task_runner),
io_task_runner_(io_task_runner),
@@ -116,7 +118,8 @@ DesktopSessionProxy::DesktopSessionProxy(
desktop_session_connector_(desktop_session_connector),
pending_capture_frame_requests_(0),
is_desktop_session_connected_(false),
- virtual_terminal_(virtual_terminal) {
+ virtual_terminal_(virtual_terminal),
+ multi_touch_enabled_(multi_touch_enabled) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
}
@@ -154,6 +157,10 @@ std::string DesktopSessionProxy::GetCapabilities() const {
// Ask the client to send its resolution unconditionally.
if (virtual_terminal_)
result = result + " " + kSendInitialResolution;
+
+ if (multi_touch_enabled_)
+ result = result + " " + kMultiTouchCapability;
+
return result;
}

Powered by Google App Engine
This is Rietveld 408576698