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..c141b958bab906474ceace3a0921abbb1def6063 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -26,6 +26,7 @@
 #endif  // defined(OS_POSIX)
 
 const char kRateLimitResizeRequests[] = "rateLimitResizeRequests";
+const char kMultiTouchCapability[] = "multiTouch";

[Wez, 2015/04/21 02:12:12]

We're calling this touchEvents elsewhere, e.g. the stub API is InjectTouchEvent
- why not call the capability touchEvents as well?

[Rintaro Kuroiwa, 2015/04/22 19:56:00]

I remember some discussion in the design doc. We didn't want something too
generic that means 'touch' so that if we want 'touchGestures' then it's not
ambiguous what 'touchEvents' mean. WDYT about rawTouchEvent?

[Wez, 2015/04/23 22:10:25]

I'm inclining back towards just touchEvents; we can call a later higher-level
addition, if any, touchGestures, touchActions, etc.

 
 namespace remoting {
 
@@ -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;

[Wez, 2015/04/21 02:12:12]

Since you're only adding this in Me2MeDesktopEnvironment, rather than in
BasicDesktopEnvironment, you won't get it set e.g. in the
IT2MeDesktopEnvironment, even though you're still telling it that it supports
multi-touch.

[Rintaro Kuroiwa, 2015/04/22 19:56:00]

BasicDE does implement GetCapabilities and checks the flag to generate the
capabilities string :)
(And IT2MeDE inherits BasicDesktopEnvironment and IT2MeDE doesn't override the
method).

[Wez, 2015/04/23 22:10:25]

Aha, missed that. I think it'd be cleaner to have this implementation call the
BasicDE one and add kRateLimitResizeRequests to it, rather than hard-coding in
the multi-touch-enabled explicitly. You could even get rid of the
supports_raw_touch_events() getter once you do that.

[Rintaro Kuroiwa, 2015/04/24 01:55:01]

Done.

+
+  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();
 }