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 'use strict'; | 5 'use strict'; |
6 | 6 |
7 /** @suppress {duplicate} */ | 7 /** @suppress {duplicate} */ |
8 var remoting = remoting || {}; | 8 var remoting = remoting || {}; |
9 | 9 |
10 /** | 10 /** |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 | 56 |
57 var onLoad = function() { | 57 var onLoad = function() { |
58 // Parse URL parameters. | 58 // Parse URL parameters. |
59 var urlParams = getUrlParameters_(); | 59 var urlParams = getUrlParameters_(); |
60 if ('mode' in urlParams) { | 60 if ('mode' in urlParams) { |
61 if (urlParams['mode'] === 'me2me') { | 61 if (urlParams['mode'] === 'me2me') { |
62 var hostId = urlParams['hostId']; | 62 var hostId = urlParams['hostId']; |
63 remoting.connectMe2Me(hostId); | 63 remoting.connectMe2Me(hostId); |
64 return; | 64 return; |
65 } else if (urlParams['mode'] === 'hangout') { | 65 } else if (urlParams['mode'] === 'hangout') { |
66 /** @param {*} id */ | 66 getCurrentId().then( |
67 getCurrentId().then(function(id) { | 67 /** @param {*} id */ |
68 /** @type {string} */ | 68 function(id) { |
69 var accessCode = urlParams['accessCode']; | 69 /** @type {string} */ |
70 var connector = remoting.app.getSessionConnector(); | 70 var accessCode = urlParams['accessCode']; |
71 remoting.setMode(remoting.AppMode.CLIENT_CONNECTING); | 71 var connector = remoting.app.getSessionConnector(); |
72 connector.connectIT2Me(accessCode); | 72 remoting.setMode(remoting.AppMode.CLIENT_CONNECTING); |
| 73 connector.connectIT2Me(accessCode); |
73 | 74 |
74 document.body.classList.add('hangout-remote-desktop'); | 75 document.body.classList.add('hangout-remote-desktop'); |
75 var senderId = /** @type {string} */ String(id); | 76 var senderId = /** @type {string} */ (String(id)); |
76 var hangoutSession = new remoting.HangoutSession(senderId); | 77 var hangoutSession = new remoting.HangoutSession(senderId); |
77 hangoutSession.init(); | 78 hangoutSession.init(); |
78 }); | 79 }); |
79 return; | 80 return; |
80 } | 81 } |
81 } | 82 } |
82 // No valid URL parameters, start up normally. | 83 // No valid URL parameters, start up normally. |
83 remoting.initHomeScreenUi(); | 84 remoting.initHomeScreenUi(); |
84 } | 85 } |
85 remoting.hostList.load(onLoad); | 86 remoting.hostList.load(onLoad); |
86 } | 87 } |
87 | 88 |
88 /** | 89 /** |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 } | 203 } |
203 | 204 |
204 | 205 |
205 remoting.startDesktopRemoting = function() { | 206 remoting.startDesktopRemoting = function() { |
206 remoting.app = new remoting.Application(); | 207 remoting.app = new remoting.Application(); |
207 var desktop_remoting = new remoting.DesktopRemoting(remoting.app); | 208 var desktop_remoting = new remoting.DesktopRemoting(remoting.app); |
208 remoting.app.start(); | 209 remoting.app.start(); |
209 }; | 210 }; |
210 | 211 |
211 window.addEventListener('load', remoting.startDesktopRemotingForTesting, false); | 212 window.addEventListener('load', remoting.startDesktopRemotingForTesting, false); |
OLD | NEW |