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

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

Issue 1191883002: Revert of [AppRemoting] Break out AppRemoting shared module (re-land). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/desktop_remoting.js ('k') | remoting/webapp/files.gni » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 /** @suppress {duplicate} */ 5 /** @suppress {duplicate} */
6 var remoting = remoting || {}; 6 var remoting = remoting || {};
7 7
8 (function() { 8 (function() {
9 9
10 'use strict'; 10 'use strict';
(...skipping 10 matching lines...) Expand all
21 */ 21 */
22 remoting.DesktopRemotingActivity = function(parentActivity) { 22 remoting.DesktopRemotingActivity = function(parentActivity) {
23 /** @private */ 23 /** @private */
24 this.parentActivity_ = parentActivity; 24 this.parentActivity_ = parentActivity;
25 /** @private {remoting.DesktopConnectedView} */ 25 /** @private {remoting.DesktopConnectedView} */
26 this.connectedView_ = null; 26 this.connectedView_ = null;
27 27
28 /** @private */ 28 /** @private */
29 this.sessionFactory_ = new remoting.ClientSessionFactory( 29 this.sessionFactory_ = new remoting.ClientSessionFactory(
30 document.querySelector('#client-container .client-plugin-container'), 30 document.querySelector('#client-container .client-plugin-container'),
31 [/* No special capabilities required. */]); 31 remoting.app_capabilities());
32 32
33 /** @private {remoting.ClientSession} */ 33 /** @private {remoting.ClientSession} */
34 this.session_ = null; 34 this.session_ = null;
35 /** @private {remoting.ConnectingDialog} */ 35 /** @private {remoting.ConnectingDialog} */
36 this.connectingDialog_ = 36 this.connectingDialog_ =
37 new remoting.ConnectingDialog(parentActivity.stop.bind(parentActivity)); 37 new remoting.ConnectingDialog(parentActivity.stop.bind(parentActivity));
38 }; 38 };
39 39
40 /** 40 /**
41 * Initiates a connection. 41 * Initiates a connection.
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 remoting.DesktopRemotingActivity.prototype.getSession = function() { 160 remoting.DesktopRemotingActivity.prototype.getSession = function() {
161 return this.session_; 161 return this.session_;
162 }; 162 };
163 163
164 /** @return {remoting.ConnectingDialog} */ 164 /** @return {remoting.ConnectingDialog} */
165 remoting.DesktopRemotingActivity.prototype.getConnectingDialog = function() { 165 remoting.DesktopRemotingActivity.prototype.getConnectingDialog = function() {
166 return this.connectingDialog_; 166 return this.connectingDialog_;
167 }; 167 };
168 168
169 })(); 169 })();
OLDNEW
« no previous file with comments | « remoting/webapp/crd/js/desktop_remoting.js ('k') | remoting/webapp/files.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698