Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Side by Side Diff: remoting/webapp/crd/js/crd_main.js

Issue 973333002: Remove Hangout Remote Desktop integration code from the webapp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + manifest changes Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/webapp/crd/js/client_screen.js ('k') | remoting/webapp/crd/js/desktop_remoting.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 }; 55 };
56 56
57 var onLoad = function() { 57 var onLoad = function() {
58 // Parse URL parameters. 58 // Parse URL parameters.
59 var urlParams = base.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') {
66 getCurrentId().then(
67 /** @param {*} id */
68 function(id) {
69 /** @type {string} */
70 var accessCode = urlParams['accessCode'];
71 var connector = remoting.app.getSessionConnector();
72 remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
73 connector.connectIT2Me(accessCode);
74
75 document.body.classList.add('hangout-remote-desktop');
76 var senderId = /** @type {string} */ (String(id));
77 var hangoutSession = new remoting.HangoutSession(senderId);
78 hangoutSession.init();
79 });
80 return;
81 } 65 }
82 } 66 }
83 // No valid URL parameters, start up normally. 67 // No valid URL parameters, start up normally.
84 remoting.initHomeScreenUi(); 68 remoting.initHomeScreenUi();
85 } 69 }
86 remoting.hostList.load(onLoad); 70 remoting.hostList.load(onLoad);
87 } 71 }
88 72
89 /** 73 /**
90 * Returns whether Host mode is supported on this platform for It2Me. 74 * Returns whether Host mode is supported on this platform for It2Me.
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 } 183 }
200 184
201 185
202 remoting.startDesktopRemoting = function() { 186 remoting.startDesktopRemoting = function() {
203 remoting.app = new remoting.Application(remoting.app_capabilities()); 187 remoting.app = new remoting.Application(remoting.app_capabilities());
204 var desktop_remoting = new remoting.DesktopRemoting(remoting.app); 188 var desktop_remoting = new remoting.DesktopRemoting(remoting.app);
205 remoting.app.start(); 189 remoting.app.start();
206 }; 190 };
207 191
208 window.addEventListener('load', remoting.startDesktopRemotingForTesting, false); 192 window.addEventListener('load', remoting.startDesktopRemotingForTesting, false);
OLDNEW
« no previous file with comments | « remoting/webapp/crd/js/client_screen.js ('k') | remoting/webapp/crd/js/desktop_remoting.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698