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..564584190765d9798ec1556a77cfefe6f84bbc3d 100644 |
--- a/remoting/host/desktop_session_proxy.cc |
+++ b/remoting/host/desktop_session_proxy.cc |
@@ -21,6 +21,7 @@ |
#include "remoting/host/ipc_mouse_cursor_monitor.h" |
#include "remoting/host/ipc_screen_controls.h" |
#include "remoting/host/ipc_video_frame_capturer.h" |
+#include "remoting/host/multi_touch_capability.h" |
#include "remoting/proto/audio.pb.h" |
#include "remoting/proto/control.pb.h" |
#include "remoting/proto/event.pb.h" |
@@ -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; |
} |