Minor cleanups in UI code that gets host state when webapp is stared

remoting/webapp/remoting.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /** @type {remoting.HostSession} */ remoting.hostSession = null;
@@ skipping 155 matching lines @@
 
   // Verify if the plugin was loaded successfully.
   if (!plugin.hasOwnProperty('REQUESTED_ACCESS_CODE')) {
     container.removeChild(plugin);
     return null;
   }
 
   return /** @type {remoting.HostPlugin} */ (plugin);
 };
 
-// TODO(sergeyu): We want to show Me2Me host controls only on some Linux
-// distributions that we know work properly with the chromoting host. Implement
-// dome detection mechanism and apply it here.
-/** @type {boolean} */
-remoting.supportedLinuxDistibutionDetected_ = false;
-
 /**
+ * Returns true if the current platform is fully supported. It's only used when
+ * we detect that host native messaging components are not installed. In that
+ * case the result of this function determines if the webapp should show the
+ * controls that allow to install and enable Me2Me host.

[Jamie, 2014/02/12 23:00:12]

You've changed the semantics of this methods without changing its name. Perhaps
a better name would be something like isMe2MeInstallable?

[Sergey Ulanov, 2014/02/13 00:44:11]

Done.

+ *
  * @return {boolean}
  */
 remoting.isMe2MeSupported = function isMe2MeSupported() {
   /** @type {string} */
   var platform = navigator.platform;
-
-  // Currently Me2Me is supported on Windows, OSX and some versions of Linux.
-  return platform == 'Win32' || platform == 'MacIntel' ||
-           ((platform == 'Linux x86_64' || platform == 'Linux i386') &&
-            remoting.supportedLinuxDistibutionDetected_ &&
-            !remoting.runningOnChromeOS());
+  return platform == 'Win32' || platform == 'MacIntel';
 }
 
 /**
  * Display the user's email address and allow access to the rest of the app,
  * including parsing URL parameters.
  *
  * @param {string} email The user's email address.
  * @return {void} Nothing.
  */
 remoting.onEmail = function(email) {
@@ skipping 27 matching lines @@
   remoting.updateLocalHostState();
   remoting.hostList.refresh(remoting.updateLocalHostState);
   remoting.butterBar = new remoting.ButterBar();
 };
 
 /**
  * Fetches local host state and updates the DOM accordingly.
  */
 remoting.updateLocalHostState = function() {
   /**
-   * @param {string?} hostId Host id.
+   * @param {remoting.HostController.State} state Host state.
    */
-  var onHostId = function(hostId) {
-    remoting.hostController.getLocalHostState(onHostState.bind(null, hostId));
+  var onHostState = function(state) {
+    if (state == remoting.HostController.State.STARTED) {
+      remoting.hostController.getLocalHostId(onHostId.bind(null, state));
+    } else {
+      onHostId(state, null);
+    }
   };
 
   /**
+   * @param {remoting.HostController.State} state Host state.
    * @param {string?} hostId Host id.
-   * @param {remoting.HostController.State} state Host state.
    */
-  var onHostState = function(hostId, state) {
+  var onHostId = function(state, hostId) {
     remoting.hostList.setLocalHostStateAndId(state, hostId);
     remoting.hostList.display();
   };
 
   /**
    * @param {boolean} response True if the feature is present.
    */
   var onHasFeatureResponse = function(response) {
     /**
      * @param {remoting.Error} error
      */
     var onError = function(error) {
       console.error('Failed to get pairing status: ' + error);
       remoting.pairedClientManager.setPairedClients([]);
     };
 
     if (response) {
       remoting.hostController.getPairedClients(
           remoting.pairedClientManager.setPairedClients.bind(
               remoting.pairedClientManager),
           onError);
     } else {
       console.log('Pairing registry not supported by host.');
       remoting.pairedClientManager.setPairedClients([]);
     }
   };
 
   remoting.hostController.hasFeature(
       remoting.HostController.Feature.PAIRING_REGISTRY, onHasFeatureResponse);
-  remoting.hostController.getLocalHostId(onHostId);
+  remoting.hostController.getLocalHostState(onHostState);
 };
 
 /**
  * Log information about the current extension.
  * The extension manifest is parsed to extract this info.
  */
 remoting.logExtensionInfo_ = function() {
   var v2OrLegacy = remoting.isAppsV2 ? " (v2)" : " (legacy)";
   var manifest = chrome.runtime.getManifest();
   if (manifest && manifest.version) {
@@ skipping 207 matching lines @@
 /**
  * Generate a nonce, to be used as an xsrf protection token.
  *
  * @return {string} A URL-Safe Base64-encoded 128-bit random value. */
 remoting.generateXsrfToken = function() {
   var random = new Uint8Array(16);
   window.crypto.getRandomValues(random);
   var base64Token = window.btoa(String.fromCharCode.apply(null, random));
   return base64Token.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
 };