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

Side by Side Diff: remoting/webapp/app_remoting/js/app_remoting.js

Issue 952353002: Requiem for client_screen.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + Ready for Check-in 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/remoting_webapp_files.gypi ('k') | remoting/webapp/base/js/application.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 /** 5 /**
6 * @fileoverview 6 * @fileoverview
7 * This class implements the functionality that is specific to application 7 * This class implements the functionality that is specific to application
8 * remoting ("AppRemoting" or AR). 8 * remoting ("AppRemoting" or AR).
9 */ 9 */
10 10
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 var host = new remoting.Host; 137 var host = new remoting.Host;
138 host.hostId = response.host.hostId; 138 host.hostId = response.host.hostId;
139 host.jabberId = hostJid; 139 host.jabberId = hostJid;
140 host.authorizationCode = response.authorizationCode; 140 host.authorizationCode = response.authorizationCode;
141 host.sharedSecret = response.sharedSecret; 141 host.sharedSecret = response.sharedSecret;
142 142
143 remoting.setMode(remoting.AppMode.CLIENT_CONNECTING); 143 remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
144 144
145 var idleDetector = new remoting.IdleDetector( 145 var idleDetector = new remoting.IdleDetector(
146 document.getElementById('idle-dialog'), 146 document.getElementById('idle-dialog'),
147 remoting.disconnect); 147 remoting.app.disconnect.bind(remoting.app));
148 148
149 /** 149 /**
150 * @param {string} tokenUrl Token-issue URL received from the host. 150 * @param {string} tokenUrl Token-issue URL received from the host.
151 * @param {string} hostPublicKey Host public key (DER and Base64 151 * @param {string} hostPublicKey Host public key (DER and Base64
152 * encoded). 152 * encoded).
153 * @param {string} scope OAuth scope to request the token for. 153 * @param {string} scope OAuth scope to request the token for.
154 * @param {function(string, string):void} onThirdPartyTokenFetched 154 * @param {function(string, string):void} onThirdPartyTokenFetched
155 * Callback. 155 * Callback.
156 */ 156 */
157 var fetchThirdPartyToken = function( 157 var fetchThirdPartyToken = function(
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 * @param {remoting.Error} errorTag The error to be localized and displayed. 349 * @param {remoting.Error} errorTag The error to be localized and displayed.
350 * @return {void} Nothing. 350 * @return {void} Nothing.
351 */ 351 */
352 remoting.AppRemoting.prototype.handleError = function(errorTag) { 352 remoting.AppRemoting.prototype.handleError = function(errorTag) {
353 console.error('Connection failed: ' + errorTag); 353 console.error('Connection failed: ' + errorTag);
354 remoting.LoadingWindow.close(); 354 remoting.LoadingWindow.close();
355 remoting.MessageWindow.showErrorMessage( 355 remoting.MessageWindow.showErrorMessage(
356 chrome.i18n.getMessage(/*i18n-content*/'CONNECTION_FAILED'), 356 chrome.i18n.getMessage(/*i18n-content*/'CONNECTION_FAILED'),
357 chrome.i18n.getMessage(/** @type {string} */ (errorTag))); 357 chrome.i18n.getMessage(/** @type {string} */ (errorTag)));
358 }; 358 };
OLDNEW
« no previous file with comments | « remoting/remoting_webapp_files.gypi ('k') | remoting/webapp/base/js/application.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698