Touch Events capability negotiation

remoting/host/me2me_desktop_environment.cc

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..689d965a101d5cbef2166f9a9f4b9e1b1b0b6550 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -17,6 +17,7 @@
 #include "remoting/host/local_input_monitor.h"
 #include "remoting/host/resizing_host_observer.h"
 #include "remoting/host/screen_controls.h"
+#include "remoting/protocol/capability_names.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 
@@ -25,8 +26,6 @@
 #include <unistd.h>
 #endif  // defined(OS_POSIX)
 
-const char kRateLimitResizeRequests[] = "rateLimitResizeRequests";
-
 namespace remoting {
 
 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() {
@@ -40,7 +39,11 @@ scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() {
 }
 
 std::string Me2MeDesktopEnvironment::GetCapabilities() const {
-  return kRateLimitResizeRequests;
+  std::string result = BasicDesktopEnvironment::GetCapabilities();
+  if (!result.empty())
+    return result + " " + protocol::kRateLimitResizeRequests;
+
+  return protocol::kRateLimitResizeRequests;

[Wez, 2015/05/21 00:59:14]

Suggest restructuring this as:

std::string capabilities = BasicDesktopEnvironment...
if (!capabilities.empty())
  capabilities.append(" ");
capabilities.append(kRateLimit...)

return capabilities;

[Rintaro Kuroiwa, 2015/05/21 21:53:30]

Done.

 }
 
 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
@@ -149,6 +152,8 @@ scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
     return nullptr;
   }
   desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_);
+  desktop_environment->set_supports_touch_events(
+      supports_touch_events());
 
   return desktop_environment.Pass();
 }