[Chromoting] Remote Assistance in Public Session.

remoting/webapp/crd/js/host_screen.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.
 
 /**
  * @fileoverview
  * Functions related to the 'host screen' for Chromoting.
  */
 
 /** @suppress {duplicate} */
@@ skipping 18 matching lines @@
  */
 var it2meLogger = null;
 
 /**
  * Start a host session. This is the main entry point for the host screen,
  * called directly from the onclick action of a button on the home screen.
  * It first verifies that the native host components are installed and asks
  * to install them if necessary.
  */
 remoting.tryShare = function() {
-  ensureIT2MeLogger_().then(tryShareWithLogger_);
-};
-
-function tryShareWithLogger_() {
+  ensureIT2MeLogger_();
   it2meLogger.setSessionId();
   it2meLogger.logClientSessionStateChange(
       remoting.ClientSession.State.INITIALIZING, remoting.Error.none(), null);
 
   /** @type {remoting.It2MeHostFacade} */
   var hostFacade = new remoting.It2MeHostFacade();
 
   /** @type {remoting.HostInstallDialog} */
   var hostInstallDialog = null;
 
@@ skipping 19 matching lines @@
   };
 
   tryInitializeFacade();
 };
 
 /**
  * @param {remoting.It2MeHostFacade} hostFacade An initialized It2MeHostFacade.
  */
 remoting.startHostUsingFacade_ = function(hostFacade) {
   console.log('Attempting to share...');
-  setHostVersion_()
-      .then(remoting.identity.getToken.bind(remoting.identity))
-      .then(remoting.tryShareWithToken_.bind(null, hostFacade),
-            remoting.Error.handler(showShareError_));
-}
+  it2meLogger.setHostVersion(hostFacade.getHostVersion());
+  remoting.identity.getToken().then(
+    remoting.tryShareWithToken_.bind(null, hostFacade),
+    remoting.Error.handler(showShareError_));
+};
 
 /**
  * @param {remoting.It2MeHostFacade} hostFacade An initialized
  *     It2MeHostFacade.
  * @param {string} token The OAuth access token.
  * @private
  */
 remoting.tryShareWithToken_ = function(hostFacade, token) {
   lastShareWasCancelled_ = false;
   onNatTraversalPolicyChanged_(true);  // Hide warning by default.
@@ skipping 260 matching lines @@
   var natBox = document.getElementById('nat-box');
   if (enabled) {
     natBox.classList.add('traversal-enabled');
   } else {
     natBox.classList.remove('traversal-enabled');
   }
 }
 
 /**
  * Create an IT2Me LogToServer instance if one does not already exist.
- *
- * @return {Promise} Promise that resolves when the host version (if available),
- *     has been set on the logger instance.
  */
 function ensureIT2MeLogger_() {
   if (it2meLogger) {
-    return Promise.resolve();
+    return;
   }
 
   var xmppConnection = new remoting.XmppConnection();
   var tokenPromise = remoting.identity.getToken();
   var emailPromise = remoting.identity.getEmail();
   tokenPromise.then(function(/** string */ token) {
     emailPromise.then(function(/** string */ email) {
       xmppConnection.connect(remoting.settings.XMPP_SERVER, email, token);
     });
   });
 
   var bufferedSignalStrategy =
       new remoting.BufferedSignalStrategy(xmppConnection);
   it2meLogger = new remoting.LogToServer(bufferedSignalStrategy, true);
   it2meLogger.setLogEntryMode(remoting.ChromotingEvent.Mode.IT2ME);
-
-  return setHostVersion_();
-};
-
-/**
- * @return {Promise} Promise that resolves when the host version (if available),
- *     has been set on the logger instance.
- */
-function setHostVersion_() {
-  return remoting.hostController.getLocalHostVersion().then(
-      function(/** string */ version) {
-        it2meLogger.setHostVersion(version);
-      }).catch(
-        base.doNothing
-      );
-};
+}
 
 })();