Index: remoting/webapp/crd/js/client_session.js |
diff --git a/remoting/webapp/crd/js/client_session.js b/remoting/webapp/crd/js/client_session.js |
index 0bb20cb674c12accc9598674044652370a83e10d..68b9b1841552e2573369bd46d8e7674fc7e2c45c 100644 |
--- a/remoting/webapp/crd/js/client_session.js |
+++ b/remoting/webapp/crd/js/client_session.js |
@@ -207,6 +207,13 @@ remoting.ClientSession.Capability = { |
// <1000 users on M-29 or below. Remove this and the capability on the host. |
RATE_LIMIT_RESIZE_REQUESTS: 'rateLimitResizeRequests', |
+ // Host & client support touch. Client can always support multi touch |
+ // because if the client is not a touch device, it cannot send touch events to |
+ // the host. What really matters is whether the host supports this. |
+ // If not the plugin should not handle touch events and get synthesized |
+ // mouse events from PPAPI. |
Wez
2015/03/30 17:10:07
Suggest rewording:
"Host & client support touch.
Rintaro Kuroiwa
2015/04/08 03:27:43
Done.
|
+ MULTI_TOUCH: 'multiTouch', |
+ |
// Indicates that host/client supports Google Drive integration, and that the |
// client should send to the host the OAuth tokens to be used by Google Drive |
// on the host. |
@@ -465,6 +472,10 @@ remoting.ClientSession.prototype.onSetCapabilities = function(capabilities) { |
if (this.hasCapability(remoting.ClientSession.Capability.GOOGLE_DRIVE)) { |
this.sendGoogleDriveAccessToken_(); |
} |
+ |
Wez
2015/03/30 17:10:07
nit: No need for blank line.
Rintaro Kuroiwa
2015/04/08 03:27:43
Done.
|
+ if (this.hasCapability(remoting.ClientSession.Capability.MULTI_TOUCH)) { |
+ this.plugin_.enableTouchEvents(); |
+ } |
}; |
/** |
@@ -602,4 +613,3 @@ remoting.ClientSession.prototype.sendGoogleDriveAccessToken_ = function() { |
window.setTimeout(this.sendGoogleDriveAccessToken_.bind(this), |
remoting.ACCESS_TOKEN_RESEND_INTERVAL_MS); |
}; |
- |