| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * @fileoverview | 6 * @fileoverview |
| 7 * This class implements the functionality that is specific to desktop | 7 * This class implements the functionality that is specific to desktop |
| 8 * remoting ("Chromoting" or CRD). | 8 * remoting ("Chromoting" or CRD). |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 | 164 |
| 165 // By default, under ChromeOS, remap the right Control key to the right | 165 // By default, under ChromeOS, remap the right Control key to the right |
| 166 // Win / Cmd key. | 166 // Win / Cmd key. |
| 167 if (remoting.platformIsChromeOS()) { | 167 if (remoting.platformIsChromeOS()) { |
| 168 connectionInfo.plugin().setRemapKeys('0x0700e4>0x0700e7'); | 168 connectionInfo.plugin().setRemapKeys('0x0700e4>0x0700e7'); |
| 169 } | 169 } |
| 170 | 170 |
| 171 if (connectionInfo.session().hasCapability( | 171 if (connectionInfo.session().hasCapability( |
| 172 remoting.ClientSession.Capability.VIDEO_RECORDER)) { | 172 remoting.ClientSession.Capability.VIDEO_RECORDER)) { |
| 173 var recorder = new remoting.VideoFrameRecorder(); | 173 var recorder = new remoting.VideoFrameRecorder(); |
| 174 this.sessionConnector_.registerProtocolExtension(recorder); | 174 connectionInfo.plugin().extensions().register(recorder); |
| 175 this.connectedView_.setVideoFrameRecorder(recorder); | 175 this.connectedView_.setVideoFrameRecorder(recorder); |
| 176 } | 176 } |
| 177 | 177 |
| 178 this.activity_.onConnected(connectionInfo); | 178 this.activity_.onConnected(connectionInfo); |
| 179 }; | 179 }; |
| 180 | 180 |
| 181 /** | 181 /** |
| 182 * @override {remoting.ApplicationInterface} | 182 * @override {remoting.ApplicationInterface} |
| 183 */ | 183 */ |
| 184 remoting.DesktopRemoting.prototype.onDisconnected_ = function() { | 184 remoting.DesktopRemoting.prototype.onDisconnected_ = function() { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 /** | 286 /** |
| 287 * Entry-point for It2Me connections. | 287 * Entry-point for It2Me connections. |
| 288 * | 288 * |
| 289 * @private | 289 * @private |
| 290 */ | 290 */ |
| 291 remoting.DesktopRemoting.prototype.connectIt2Me_ = function() { | 291 remoting.DesktopRemoting.prototype.connectIt2Me_ = function() { |
| 292 base.dispose(this.activity_); | 292 base.dispose(this.activity_); |
| 293 this.activity_ = new remoting.It2MeActivity(this.sessionConnector_); | 293 this.activity_ = new remoting.It2MeActivity(this.sessionConnector_); |
| 294 this.activity_.start(); | 294 this.activity_.start(); |
| 295 }; | 295 }; |
| OLD | NEW |