| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 if (tab) { | 49 if (tab) { |
| 50 resolve(String(tab.id)); | 50 resolve(String(tab.id)); |
| 51 } | 51 } |
| 52 reject('Cannot retrieve the current tab.'); | 52 reject('Cannot retrieve the current tab.'); |
| 53 }); | 53 }); |
| 54 }); | 54 }); |
| 55 }; | 55 }; |
| 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 = base.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 getCurrentId().then( | 66 getCurrentId().then( |
| 67 /** @param {*} id */ | 67 /** @param {*} id */ |
| 68 function(id) { | 68 function(id) { |
| 69 /** @type {string} */ | 69 /** @type {string} */ |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 * Entry point for test code. In order to make test and production | 181 * Entry point for test code. In order to make test and production |
| 182 * code as similar as possible, the same entry point is used for | 182 * code as similar as possible, the same entry point is used for |
| 183 * production code, but since production code should never have | 183 * production code, but since production code should never have |
| 184 * 'source' set to 'test', it continue with initialization | 184 * 'source' set to 'test', it continue with initialization |
| 185 * immediately. As a fail-safe, the mechanism by which initialization | 185 * immediately. As a fail-safe, the mechanism by which initialization |
| 186 * completes when under test is controlled by a simple UI, making it | 186 * completes when under test is controlled by a simple UI, making it |
| 187 * possible to use the app even if the previous assumption fails to | 187 * possible to use the app even if the previous assumption fails to |
| 188 * hold in some corner cases. | 188 * hold in some corner cases. |
| 189 */ | 189 */ |
| 190 remoting.startDesktopRemotingForTesting = function() { | 190 remoting.startDesktopRemotingForTesting = function() { |
| 191 var urlParams = getUrlParameters_(); | 191 var urlParams = base.getUrlParameters(); |
| 192 if (urlParams['source'] === 'test') { | 192 if (urlParams['source'] === 'test') { |
| 193 document.getElementById('browser-test-continue-init').addEventListener( | 193 document.getElementById('browser-test-continue-init').addEventListener( |
| 194 'click', remoting.startDesktopRemoting, false); | 194 'click', remoting.startDesktopRemoting, false); |
| 195 document.getElementById('browser-test-deferred-init').hidden = false; | 195 document.getElementById('browser-test-deferred-init').hidden = false; |
| 196 } else { | 196 } else { |
| 197 remoting.startDesktopRemoting(); | 197 remoting.startDesktopRemoting(); |
| 198 } | 198 } |
| 199 } | 199 } |
| 200 | 200 |
| 201 | 201 |
| 202 remoting.startDesktopRemoting = function() { | 202 remoting.startDesktopRemoting = function() { |
| 203 remoting.app = new remoting.Application(); | 203 remoting.app = new remoting.Application(); |
| 204 var desktop_remoting = new remoting.DesktopRemoting(remoting.app); | 204 var desktop_remoting = new remoting.DesktopRemoting(remoting.app); |
| 205 remoting.app.start(); | 205 remoting.app.start(); |
| 206 }; | 206 }; |
| 207 | 207 |
| 208 window.addEventListener('load', remoting.startDesktopRemotingForTesting, false); | 208 window.addEventListener('load', remoting.startDesktopRemotingForTesting, false); |
| OLD | NEW |