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

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

Issue 22303004: Update pairing information so that reconnect doesn't request a PIN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reviewer comments. Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | remoting/webapp/session_connector.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 * Functions related to the 'client screen' for Chromoting. 7 * Functions related to the 'client screen' for Chromoting.
8 */ 8 */
9 9
10 'use strict'; 10 'use strict';
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 * @param {string} sharedSecret 349 * @param {string} sharedSecret
350 */ 350 */
351 var onPairingComplete = function(clientId, sharedSecret) { 351 var onPairingComplete = function(clientId, sharedSecret) {
352 var pairingInfo = { 352 var pairingInfo = {
353 pairingInfo: { 353 pairingInfo: {
354 clientId: clientId, 354 clientId: clientId,
355 sharedSecret: sharedSecret 355 sharedSecret: sharedSecret
356 } 356 }
357 }; 357 };
358 remoting.HostSettings.save(clientSession.hostId, pairingInfo); 358 remoting.HostSettings.save(clientSession.hostId, pairingInfo);
359 remoting.connector.updatePairingInfo(clientId, sharedSecret);
359 }; 360 };
360 // Use the platform name as a proxy for the local computer name. 361 // Use the platform name as a proxy for the local computer name.
361 // TODO(jamiewalch): Use a descriptive name for the local computer, for 362 // TODO(jamiewalch): Use a descriptive name for the local computer, for
362 // example, its Chrome Sync name. 363 // example, its Chrome Sync name.
363 var clientName = ''; 364 var clientName = '';
364 if (navigator.platform.indexOf('Mac') != -1) { 365 if (navigator.platform.indexOf('Mac') != -1) {
365 clientName = 'Mac'; 366 clientName = 'Mac';
366 } else if (navigator.platform.indexOf('Win32') != -1) { 367 } else if (navigator.platform.indexOf('Win32') != -1) {
367 clientName = 'Windows'; 368 clientName = 'Windows';
368 } else if (navigator.userAgent.match(/\bCrOS\b/)) { 369 } else if (navigator.userAgent.match(/\bCrOS\b/)) {
369 clientName = 'ChromeOS'; 370 clientName = 'ChromeOS';
370 } else if (navigator.platform.indexOf('Linux') != -1) { 371 } else if (navigator.platform.indexOf('Linux') != -1) {
371 clientName = 'Linux'; 372 clientName = 'Linux';
372 } else { 373 } else {
373 console.log('Unrecognized client platform. Using navigator.platform.'); 374 console.log('Unrecognized client platform. Using navigator.platform.');
374 clientName = navigator.platform; 375 clientName = navigator.platform;
375 } 376 }
376 clientSession.requestPairing(clientName, onPairingComplete); 377 clientSession.requestPairing(clientName, onPairingComplete);
377 } 378 }
378 }; 379 };
OLDNEW
« no previous file with comments | « no previous file | remoting/webapp/session_connector.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698