| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 * Functions related to the 'client screen' for Chromoting. | 7 * Functions related to the 'client screen' for Chromoting. |
| 8 */ | 8 */ |
| 9 | 9 |
| 10 'use strict'; | 10 'use strict'; |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 // automatically retry. | 209 // automatically retry. |
| 210 var clearPin = false; | 210 var clearPin = false; |
| 211 | 211 |
| 212 if (newState == remoting.ClientSession.State.CREATED) { | 212 if (newState == remoting.ClientSession.State.CREATED) { |
| 213 console.log('Created plugin'); | 213 console.log('Created plugin'); |
| 214 | 214 |
| 215 } else if (newState == remoting.ClientSession.State.BAD_PLUGIN_VERSION) { | 215 } else if (newState == remoting.ClientSession.State.BAD_PLUGIN_VERSION) { |
| 216 showConnectError_(remoting.Error.BAD_PLUGIN_VERSION); | 216 showConnectError_(remoting.Error.BAD_PLUGIN_VERSION); |
| 217 | 217 |
| 218 } else if (newState == remoting.ClientSession.State.CONNECTING) { | 218 } else if (newState == remoting.ClientSession.State.CONNECTING) { |
| 219 console.log('Connecting as ' + remoting.oauth2.getCachedEmail()); | 219 console.log('Connecting as ' + remoting.identity.getCachedEmail()); |
| 220 | 220 |
| 221 } else if (newState == remoting.ClientSession.State.INITIALIZING) { | 221 } else if (newState == remoting.ClientSession.State.INITIALIZING) { |
| 222 console.log('Initializing connection'); | 222 console.log('Initializing connection'); |
| 223 | 223 |
| 224 } else if (newState == remoting.ClientSession.State.CONNECTED) { | 224 } else if (newState == remoting.ClientSession.State.CONNECTED) { |
| 225 if (remoting.clientSession) { | 225 if (remoting.clientSession) { |
| 226 clearPin = true; | 226 clearPin = true; |
| 227 setConnectionInterruptedButtonsText_(); | 227 setConnectionInterruptedButtonsText_(); |
| 228 remoting.retryIfOffline = false; | 228 remoting.retryIfOffline = false; |
| 229 remoting.setMode(remoting.AppMode.IN_SESSION); | 229 remoting.setMode(remoting.AppMode.IN_SESSION); |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 remoting.clientSession = | 523 remoting.clientSession = |
| 524 new remoting.ClientSession( | 524 new remoting.ClientSession( |
| 525 remoting.hostJid, remoting.hostPublicKey, | 525 remoting.hostJid, remoting.hostPublicKey, |
| 526 pin, 'spake2_hmac,spake2_plain', remoting.hostId, | 526 pin, 'spake2_hmac,spake2_plain', remoting.hostId, |
| 527 remoting.ClientSession.Mode.ME2ME, onClientStateChange_); | 527 remoting.ClientSession.Mode.ME2ME, onClientStateChange_); |
| 528 // Don't log errors for cached JIDs. | 528 // Don't log errors for cached JIDs. |
| 529 remoting.clientSession.logErrors(!remoting.retryIfOffline); | 529 remoting.clientSession.logErrors(!remoting.retryIfOffline); |
| 530 remoting.clientSession.createPluginAndConnect( | 530 remoting.clientSession.createPluginAndConnect( |
| 531 document.getElementById('session-mode')); | 531 document.getElementById('session-mode')); |
| 532 } | 532 } |
| OLD | NEW |