remoting/webapp/crd/js/desktop_remoting.js - Issue 1101613003: [Webapp Refactor] Reliably cancels a connection.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« remoting/webapp/crd/js/crd_event_handlers.js ('K') | « remoting/webapp/crd/js/crd_event_handlers.js ('k') | remoting/webapp/crd/js/desktop_remoting_activity.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/webapp/crd/js/desktop_remoting.js

diff --git a/remoting/webapp/crd/js/desktop_remoting.js b/remoting/webapp/crd/js/desktop_remoting.js

index a8b1cf2858d2cedb51c3ea4a589e4ae8d176fd64..39dfe5649040411f7f544cdbb8e2c6fa66d456dd 100644

--- a/remoting/webapp/crd/js/desktop_remoting.js

+++ b/remoting/webapp/crd/js/desktop_remoting.js

@@ -209,7 +209,7 @@ remoting.DesktopRemoting.prototype.disconnect_ = function() {

remoting.DesktopRemoting.prototype.connectMe2Me_ = function(hostId) {

var host = remoting.hostList.getHostForId(hostId);

base.dispose(this.activity_);

- this.activity_ = new remoting.Me2MeActivity(host);

+ this.activity_ = new remoting.Me2MeActivity(host, remoting.hostList);

this.activity_.start();

};