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

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

Issue 1101613003: [Webapp Refactor] Reliably cancels a connection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ImproveUnittest
Patch Set: Created 5 years, 8 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
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 /** 5 /**
6 * @fileoverview 6 * @fileoverview
7 * This class implements the functionality that is specific to desktop 7 * This class implements the functionality that is specific to desktop
8 * remoting ("Chromoting" or CRD). 8 * remoting ("Chromoting" or CRD).
9 */ 9 */
10 10
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 /** 202 /**
203 * Entry-point for Me2Me connections. 203 * Entry-point for Me2Me connections.
204 * 204 *
205 * @param {string} hostId The unique id of the host. 205 * @param {string} hostId The unique id of the host.
206 * @return {void} Nothing. 206 * @return {void} Nothing.
207 * @private 207 * @private
208 */ 208 */
209 remoting.DesktopRemoting.prototype.connectMe2Me_ = function(hostId) { 209 remoting.DesktopRemoting.prototype.connectMe2Me_ = function(hostId) {
210 var host = remoting.hostList.getHostForId(hostId); 210 var host = remoting.hostList.getHostForId(hostId);
211 base.dispose(this.activity_); 211 base.dispose(this.activity_);
212 this.activity_ = new remoting.Me2MeActivity(host); 212 this.activity_ = new remoting.Me2MeActivity(host, remoting.hostList);
213 this.activity_.start(); 213 this.activity_.start();
214 }; 214 };
215 215
216 /** 216 /**
217 * Entry-point for It2Me connections. 217 * Entry-point for It2Me connections.
218 * 218 *
219 * @private 219 * @private
220 */ 220 */
221 remoting.DesktopRemoting.prototype.connectIt2Me_ = function() { 221 remoting.DesktopRemoting.prototype.connectIt2Me_ = function() {
222 base.dispose(this.activity_); 222 base.dispose(this.activity_);
223 this.activity_ = new remoting.It2MeActivity(); 223 this.activity_ = new remoting.It2MeActivity();
224 this.activity_.start(); 224 this.activity_.start();
225 }; 225 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698