summaryrefslogtreecommitdiffstats
path: root/remoting/webapp/crd/js/desktop_remoting.js
diff options
context:
space:
mode:
authorgarykac <garykac@chromium.org>2015-03-13 13:38:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-13 20:38:55 +0000
commitcd415d0eb53fa448ca0affc8b7f544334948a66a (patch)
treec68a7e503be32d1cfb2ee0741636112bffcf2a16 /remoting/webapp/crd/js/desktop_remoting.js
parent365d55c8324e82db0473834a09816953cb158501 (diff)
downloadchromium_src-cd415d0eb53fa448ca0affc8b7f544334948a66a.zip
chromium_src-cd415d0eb53fa448ca0affc8b7f544334948a66a.tar.gz
chromium_src-cd415d0eb53fa448ca0affc8b7f544334948a66a.tar.bz2
[Chromoting] Create ProtocolExtension interface
This creates an Application.ProtocolExtension interface and updates our extensions to make use of it. Extension-specific code in the clientsession has been generalized and the Application.Delegate registers the extensions that it wants (rather than having the clientsession automatically adding extension based on the current application. After this cl, clientsession no longer has special code to handle the cast and gnubby extensions. BUG=465878 Review URL: https://codereview.chromium.org/1001073002 Cr-Commit-Position: refs/heads/master@{#320565}
Diffstat (limited to 'remoting/webapp/crd/js/desktop_remoting.js')
-rw-r--r--remoting/webapp/crd/js/desktop_remoting.js11
1 files changed, 11 insertions, 0 deletions
diff --git a/remoting/webapp/crd/js/desktop_remoting.js b/remoting/webapp/crd/js/desktop_remoting.js
index 186c5b6..10e35c5 100644
--- a/remoting/webapp/crd/js/desktop_remoting.js
+++ b/remoting/webapp/crd/js/desktop_remoting.js
@@ -192,6 +192,17 @@ remoting.DesktopRemoting.prototype.handleConnected = function(clientSession) {
remoting.toolbar.preview();
}
+ if (remoting.desktopConnectedView.getMode() ==
+ remoting.DesktopConnectedView.Mode.ME2ME) {
+ var sessionConnector = remoting.app.getSessionConnector();
+ if (remoting.app.hasCapability(remoting.ClientSession.Capability.CAST)) {
+ sessionConnector.registerProtocolExtension(
+ new remoting.CastExtensionHandler());
+ }
+ sessionConnector.registerProtocolExtension(
+ new remoting.GnubbyAuthHandler());
+ }
+
if (remoting.pairingRequested) {
/**
* @param {string} clientId