Don't transition to in-session mode until the connection has been established.

remoting/webapp/me2mom/remoting.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.
 
 var remoting = remoting || {};
 
 (function() {
 'use strict';
 
 window.addEventListener('blur', pluginLostFocus_, false);
@@ skipping 420 matching lines @@
       ', Capture: ' + stats['capture_latency'].toFixed(2) + 'ms' +
       ', Encode: ' + stats['encode_latency'].toFixed(2) + 'ms' +
       ', Decode: ' + stats['decode_latency'].toFixed(2) + 'ms' +
       ', Render: ' + stats['render_latency'].toFixed(2) + 'ms' +
       ', Latency: ' + stats['roundtrip_latency'].toFixed(2) + 'ms';
 
   // Update the stats once per second.
   window.setTimeout(updateStatistics, 1000);
 }
 
-function onClientStateChange_(state) {
+function onClientStateChange_(oldState) {
+  var state = remoting.session.state;
   if (state == remoting.ClientSession.State.UNKNOWN) {
     setClientStateMessage('Unknown');
   } else if (state == remoting.ClientSession.State.CREATED) {
     setClientStateMessage('Created');
   } else if (state == remoting.ClientSession.State.BAD_PLUGIN_VERSION) {
     setClientStateMessage('Incompatible Plugin Version');
   } else if (state == remoting.ClientSession.State.UNKNOWN_PLUGIN_ERROR) {
     setClientStateMessage('Unknown error with plugin.');
   } else if (state == remoting.ClientSession.State.CONNECTING) {
     setClientStateMessage('Connecting as ' + remoting.username);
   } else if (state == remoting.ClientSession.State.INITIALIZING) {
     setClientStateMessage('Initializing connection');
   } else if (state == remoting.ClientSession.State.CONNECTED) {
     var split = remoting.hostJid.split('/');
     var host = null;
     if (split.length == 2) {
       host = split[0];
     }
     setClientStateMessage('Connected to', host);
+    setGlobalMode(remoting.AppMode.IN_SESSION);
     updateStatistics();
   } else if (state == remoting.ClientSession.State.CLOSED) {
     setClientStateMessage('Closed');
+    if (oldState != remoting.ClientSession.State.CONNECTED) {
+      // TODO(jamiewalch): This is not quite correct, as it will report
+      // "Invalid access code", regardless of what actually went wrong.
+      // Fix this up by having the host send a suitable error code.
+      showConnectError_(404);
+    }
   } else if (state == remoting.ClientSession.State.CONNECTION_FAILED) {
     setClientStateMessage('Failed');
   } else {
     setClientStateMessage('Bad State: ' + state);
   }
 }
 
 function startSession_() {
   remoting.debug.log('Starting session...');
   remoting.username = getEmail();
-  setGlobalMode(remoting.AppMode.IN_SESSION);
   remoting.session =
       new remoting.ClientSession(remoting.hostJid, remoting.hostPublicKey,
                                  remoting.accessCode, getEmail(),
                                  onClientStateChange_);
   remoting.oauth2.callWithToken(function(token) {
     remoting.session.createPluginAndConnect(
         document.getElementById('session-mode'),
         token);
   });
 }
@@ skipping 147 matching lines @@
     remoting.session = null;
     remoting.debug.log('Disconnected.');
     remoting.setClientMode('unconnected');
     var accessCode = document.getElementById('access-code-entry');
     accessCode.value = '';
     setGlobalMode(remoting.AppMode.CLIENT);
   }
 }
 
 }());