Launch Me2Me connections in a new tab. Remove OK button from post-connect screens for Me2Me.

remoting/webapp/me2mom/client_screen.js

 // Copyright (c) 2011 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 'client screen' for Chromoting.
  */
 
 'use strict';
@@ skipping 29 matching lines @@
  */
 remoting.hostPublicKey = '';
 
 /**
  * @type {XMLHttpRequest} The XHR object corresponding to the current
  *     support-hosts request, if there is one outstanding.
  */
 remoting.supportHostsXhr_ = null;
 
 /**
+ * @enum {string}
+ */
+remoting.ConnectionType = {
+  It2Me: 'It2Me',
+  Me2Me: 'Me2Me'
+};
+
+/**
+ * @type {remoting.ConnectionType?}
+ */
+remoting.currentConnectionType = null;
+
+/**
  * Entry point for the 'connect' functionality. This function checks for the
  * existence of an OAuth2 token, and either requests one asynchronously, or
  * calls through directly to tryConnectWithAccessToken_.
  */
 remoting.tryConnect = function() {
   document.getElementById('cancel-button').disabled = false;
   if (remoting.oauth2.needsNewAccessToken()) {
     remoting.oauth2.refreshAccessToken(function(xhr) {
       if (remoting.oauth2.needsNewAccessToken()) {
         // Failed to get access token
@@ skipping 56 matching lines @@
 /**
  * Disconnect the remoting client.
  *
  * @return {void} Nothing.
  */
 remoting.disconnect = function() {
   if (remoting.clientSession) {
     remoting.clientSession.disconnect();
     remoting.clientSession = null;
     remoting.debug.log('Disconnected.');
-    remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED);
+    if (remoting.currentConnectionType == remoting.ConnectionType.It2Me) {
+      remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_IT2ME);
+    } else {
+      remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
+    }
   }
 }
 
 /**
  * Second stage of the 'connect' functionality. Once an access token is
  * available, load the WCS widget asynchronously and call through to
  * tryConnectWithWcs_ when ready.
  */
 function tryConnectWithAccessToken_() {
   if (!remoting.wcsLoader) {
@@ skipping 22 matching lines @@
     // At present, only 12-digit access codes are supported, of which the first
     // 7 characters are the supportId.
     var kSupportIdLen = 7;
     var kHostSecretLen = 5;
     var kAccessCodeLen = kSupportIdLen + kHostSecretLen;
     if (remoting.accessCode.length != kAccessCodeLen) {
       remoting.debug.log('Bad access code length');
       showConnectError_(remoting.Error.INVALID_ACCESS_CODE);
     } else {
       var supportId = remoting.accessCode.substring(0, kSupportIdLen);
+      remoting.currentConnectionType = remoting.ConnectionType.It2Me;
       remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
       resolveSupportId(supportId);
     }
   } else {
     showConnectError_(remoting.Error.AUTHENTICATION_FAILED);
   }
 }
 
 /**
  * Callback function called when the state of the client plugin changes. The
@@ skipping 28 matching lines @@
       recenterToolbar_();
       showToolbarPreview_();
       updateStatistics_();
     }
 
   } else if (newState == remoting.ClientSession.State.CLOSED) {
     if (oldState == remoting.ClientSession.State.CONNECTED) {
       remoting.clientSession.removePlugin();
       remoting.clientSession = null;
       remoting.debug.log('Connection closed by host');
-      remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED);
+      if (remoting.currentConnectionType == remoting.ConnectionType.It2Me) {
+        remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_IT2ME);
+      } else {
+        remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
+      }
     } else {
       // The transition from CONNECTING to CLOSED state may happen
       // only with older client plugins. Current version should go the
       // FAILED state when connection fails.
       showConnectError_(remoting.Error.INVALID_ACCESS_CODE);
     }
 
   } else if (newState == remoting.ClientSession.State.CONNECTION_FAILED) {
     remoting.debug.log('Client plugin reported connection failed: ' +
                        remoting.clientSession.error);
@@ skipping 54 matching lines @@
  */
 function showConnectError_(errorTag) {
   remoting.debug.log('Connection failed: ' + errorTag);
   var errorDiv = document.getElementById('connect-error-message');
   l10n.localizeElementFromTag(errorDiv, /** @type {string} */ (errorTag));
   remoting.accessCode = '';
   if (remoting.clientSession) {
     remoting.clientSession.disconnect();
     remoting.clientSession = null;
   }
-  remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED);
+  if (remoting.currentConnectionType == remoting.ConnectionType.It2Me) {
+    remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
+  } else {
+    remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_ME2ME);
+  }
 }
 
 /**
  * Parse the response from the server to a request to resolve a support id.
  *
  * @param {XMLHttpRequest} xhr The XMLHttpRequest object.
  * @return {void} Nothing.
  */
 function parseServerResponse_(xhr) {
   remoting.supportHostsXhr_ = null;
@@ skipping 78 matching lines @@
  */
 function recenterToolbar_() {
   var toolbar = document.getElementById('session-toolbar');
   var toolbarX = (window.innerWidth - toolbar.clientWidth) / 2;
   toolbar.style['left'] = toolbarX + 'px';
 }
 
 /**
  * Start a connection to the specified host, using the stored details.
  *
- * @param {string} hostId The Id of the host to connect to.
+ * @param {string} hostJid The jabber Id of the host.
+ * @param {string} hostPublicKey The public key of the host.
+ * @param {string} hostName The name of the host.
  * @return {void} Nothing.
  */
-remoting.connectHost = function(hostId) {
-  var hostTableEntry = remoting.hostList.getHostForId(hostId);
-  if (!hostTableEntry) {
-    console.error('connectHost: Unrecognised hostId: ' + hostId);
-    return;
-  }
-
-  remoting.hostJid = hostTableEntry.host.jabberId;
-  remoting.hostPublicKey = hostTableEntry.host.publicKey;
-  document.getElementById('connected-to').innerText =
-  hostTableEntry.host.hostName;
+remoting.connectHost = function(hostJid, hostPublicKey, hostName) {
+  // TODO(jamiewalch): Instead of passing the jid in the URL, cache it in local
+  // storage so that host bookmarks can be implemented efficiently.
+  remoting.hostJid = hostJid;
+  remoting.hostPublicKey = hostPublicKey;
+  document.getElementById('connected-to').innerText = hostName;
+  document.title = document.title + ': ' + hostName;
 
   remoting.debug.log('Connecting to host...');
+  remoting.currentConnectionType = remoting.ConnectionType.Me2Me;
+  remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
 
   if (!remoting.wcsLoader) {
     remoting.wcsLoader = new remoting.WcsLoader();
   }
   /** @param {function(string):void} setToken The callback function. */
   var callWithToken = function(setToken) {
     remoting.oauth2.callWithToken(setToken);
   };
-  remoting.wcsLoader.start(
-      remoting.oauth2.getAccessToken(),
-      callWithToken,
-      remoting.connectHostWithWcs);
+  remoting.wcsLoader.startAsync(callWithToken, remoting.connectHostWithWcs);

[Jamie, 2011/11/30 21:23:43]

The token might not be valid any more, especially if launching from a bookmark,
so we have to do this asynchronously.

 }
 
 /**
  * Continue making the connection to a host, once WCS has initialized.
  *
  * @return {void} Nothing.
  */
 remoting.connectHostWithWcs = function() {
-  remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);

[Jamie, 2011/11/30 21:23:43]

I'm not sure why this was being done so late in the connection process, but the
use of asynchronous connect highlights that it should be done earlier.

-
   remoting.clientSession =
   new remoting.ClientSession(
       remoting.hostJid, remoting.hostPublicKey,
       '', /** @type {string} */ (remoting.oauth2.getCachedEmail()),
       onClientStateChange_);
   /** @param {string} token The auth token. */
   var createPluginAndConnect = function(token) {
     remoting.clientSession.createPluginAndConnect(
         document.getElementById('session-mode'),
         token);
   };
 
-  remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
   remoting.oauth2.callWithToken(createPluginAndConnect);
 }
 
 }());