| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 * Connect set-up state machine for Me2Me and IT2Me | 7 * Connect set-up state machine for Me2Me and IT2Me |
| 8 */ | 8 */ |
| 9 | 9 |
| 10 'use strict'; | 10 'use strict'; |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 * @private | 187 * @private |
| 188 */ | 188 */ |
| 189 this.fetchPin_ = function(onPinFetched) {}; | 189 this.fetchPin_ = function(onPinFetched) {}; |
| 190 | 190 |
| 191 /** | 191 /** |
| 192 * @type {function(string, string, string, | 192 * @type {function(string, string, string, |
| 193 * function(string, string):void): void} | 193 * function(string, string):void): void} |
| 194 * @private | 194 * @private |
| 195 */ | 195 */ |
| 196 this.fetchThirdPartyToken_ = function( | 196 this.fetchThirdPartyToken_ = function( |
| 197 tokenUrl, scope, onThirdPartyTokenFetched) {}; | 197 tokenUrl, hostPublicKey, scope, onThirdPartyTokenFetched) {}; |
| 198 | 198 |
| 199 /** | 199 /** |
| 200 * Host 'name', as displayed in the client tool-bar. For a Me2Me connection, | 200 * Host 'name', as displayed in the client tool-bar. For a Me2Me connection, |
| 201 * this is the name of the host; for an IT2Me connection, it is the email | 201 * this is the name of the host; for an IT2Me connection, it is the email |
| 202 * address of the person sharing their computer. | 202 * address of the person sharing their computer. |
| 203 * | 203 * |
| 204 * @type {string} | 204 * @type {string} |
| 205 * @private | 205 * @private |
| 206 */ | 206 */ |
| 207 this.hostDisplayName_ = ''; | 207 this.hostDisplayName_ = ''; |
| 208 }; | 208 }; |
| 209 | 209 |
| 210 /** | 210 /** |
| 211 * Initiate a Me2Me connection. | 211 * Initiate a Me2Me connection. |
| 212 * | 212 * |
| 213 * This doesn't report host-offline errors because the connection will | 213 * This doesn't report host-offline errors because the connection will |
| 214 * be retried and retryConnectMe2Me is responsible for reporting these errors. | 214 * be retried and retryConnectMe2Me is responsible for reporting these errors. |
| 215 * | 215 * |
| 216 * @param {remoting.Host} host The Me2Me host to which to connect. | 216 * @param {remoting.Host} host The Me2Me host to which to connect. |
| 217 * @param {function(boolean, function(string):void):void} fetchPin Function to | 217 * @param {function(boolean, function(string):void):void} fetchPin Function to |
| 218 * interactively obtain the PIN from the user. | 218 * interactively obtain the PIN from the user. |
| 219 * @param {function(string, string, string, | 219 * @param {function(string, string, string, |
| 220 * function(string, string): void): void} | 220 * function(string, string): void): void} |
| 221 * fetchThirdPartyToken Function to obtain a token from a third party | 221 * fetchThirdPartyToken Function to obtain a token from a third party |
| 222 * authenticaiton server. | 222 * authentication server. |
| 223 * @param {string} clientPairingId The client id issued by the host when | 223 * @param {string} clientPairingId The client id issued by the host when |
| 224 * this device was paired, if it is already paired. | 224 * this device was paired, if it is already paired. |
| 225 * @param {string} clientPairedSecret The shared secret issued by the host when | 225 * @param {string} clientPairedSecret The shared secret issued by the host when |
| 226 * this device was paired, if it is already paired. | 226 * this device was paired, if it is already paired. |
| 227 * @return {void} Nothing. | 227 * @return {void} Nothing. |
| 228 */ | 228 */ |
| 229 remoting.SessionConnectorImpl.prototype.connectMe2Me = | 229 remoting.SessionConnectorImpl.prototype.connectMe2Me = |
| 230 function(host, fetchPin, fetchThirdPartyToken, | 230 function(host, fetchPin, fetchThirdPartyToken, |
| 231 clientPairingId, clientPairedSecret) { | 231 clientPairingId, clientPairedSecret) { |
| 232 this.connectionMode_ = remoting.DesktopConnectedView.Mode.ME2ME; | 232 this.connectionMode_ = remoting.DesktopConnectedView.Mode.ME2ME; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 * | 291 * |
| 292 * @param {string} hostId ID of the Me2Me host. | 292 * @param {string} hostId ID of the Me2Me host. |
| 293 * @param {string} hostJid XMPP JID of the host. | 293 * @param {string} hostJid XMPP JID of the host. |
| 294 * @param {string} hostPublicKey Public Key of the host. | 294 * @param {string} hostPublicKey Public Key of the host. |
| 295 * @param {string} hostDisplayName Display name (friendly name) of the host. | 295 * @param {string} hostDisplayName Display name (friendly name) of the host. |
| 296 * @param {function(boolean, function(string):void):void} fetchPin Function to | 296 * @param {function(boolean, function(string):void):void} fetchPin Function to |
| 297 * interactively obtain the PIN from the user. | 297 * interactively obtain the PIN from the user. |
| 298 * @param {function(string, string, string, | 298 * @param {function(string, string, string, |
| 299 * function(string, string): void): void} | 299 * function(string, string): void): void} |
| 300 * fetchThirdPartyToken Function to obtain a token from a third party | 300 * fetchThirdPartyToken Function to obtain a token from a third party |
| 301 * authenticaiton server. | 301 * authentication server. |
| 302 * @param {string} clientPairingId The client id issued by the host when | 302 * @param {string} clientPairingId The client id issued by the host when |
| 303 * this device was paired, if it is already paired. | 303 * this device was paired, if it is already paired. |
| 304 * @param {string} clientPairedSecret The shared secret issued by the host when | 304 * @param {string} clientPairedSecret The shared secret issued by the host when |
| 305 * this device was paired, if it is already paired. | 305 * this device was paired, if it is already paired. |
| 306 * @return {void} Nothing. | 306 * @return {void} Nothing. |
| 307 * @private | 307 * @private |
| 308 */ | 308 */ |
| 309 remoting.SessionConnectorImpl.prototype.connectMe2MeInternal_ = | 309 remoting.SessionConnectorImpl.prototype.connectMe2MeInternal_ = |
| 310 function(hostId, hostJid, hostPublicKey, hostDisplayName, | 310 function(hostId, hostJid, hostPublicKey, hostDisplayName, |
| 311 fetchPin, fetchThirdPartyToken, | 311 fetchPin, fetchThirdPartyToken, |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 */ | 655 */ |
| 656 remoting.DefaultSessionConnectorFactory.prototype.createConnector = | 656 remoting.DefaultSessionConnectorFactory.prototype.createConnector = |
| 657 function(clientContainer, onConnected, onError, onExtensionMessage, | 657 function(clientContainer, onConnected, onError, onExtensionMessage, |
| 658 onConnectionFailed, requiredCapabilities, defaultRemapKeys) { | 658 onConnectionFailed, requiredCapabilities, defaultRemapKeys) { |
| 659 return new remoting.SessionConnectorImpl(clientContainer, onConnected, | 659 return new remoting.SessionConnectorImpl(clientContainer, onConnected, |
| 660 onError, onExtensionMessage, | 660 onError, onExtensionMessage, |
| 661 onConnectionFailed, | 661 onConnectionFailed, |
| 662 requiredCapabilities, | 662 requiredCapabilities, |
| 663 defaultRemapKeys); | 663 defaultRemapKeys); |
| 664 }; | 664 }; |
| OLD | NEW |