[Webapp Refactor] Reliably cancels a connection.

remoting/webapp/crd/js/crd_event_handlers.js

 // Copyright 2014 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 || {};
 
 remoting.initElementEventHandlers = function() {
   var goHome = function() {
     remoting.setMode(remoting.AppMode.HOME);
   };
-  var goFinishedIT2Me = function() {

[kelvinp, 2015/04/22 01:19:01]

Dead code.

-    if (remoting.currentMode == remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME) {
-      remoting.setMode(remoting.AppMode.CLIENT_UNCONNECTED);
-    } else {
-      goHome();
-    }
-  };
   /** @type {Array<{event: string, id: string, fn: function(Event):void}>} */
   var it2me_actions = [
       { event: 'click', id: 'cancel-share-button', fn: remoting.cancelShare },
       { event: 'click', id: 'get-started-it2me',
         fn: remoting.showIT2MeUiAndSave },
       { event: 'click', id: 'host-finished-button', fn: goHome },
       { event: 'click', id: 'share-button', fn: remoting.tryShare }
   ];
   /** @type {Array<{event: string, id: string, fn: function(Event):void}>} */
   var me2me_actions = [
       { event: 'click', id: 'daemon-pin-cancel', fn: goHome },
       { event: 'click', id: 'get-started-me2me',
         fn: remoting.showMe2MeUiAndSave }
   ];
   /** @type {Array<{event: string, id: string, fn: function(Event):void}>} */
   var host_actions = [
       { event: 'click', id: 'close-paired-client-manager-dialog', fn: goHome },
       { event: 'click', id: 'host-config-done-dismiss', fn: goHome },
       { event: 'click', id: 'host-config-error-dismiss', fn: goHome },
       { event: 'click', id: 'open-paired-client-manager-dialog',
         fn: remoting.setMode.bind(null,
                                   remoting.AppMode.HOME_MANAGE_PAIRINGS) },
       { event: 'click', id: 'stop-sharing-button', fn: remoting.cancelShare }
   ];
   /** @type {Array<{event: string, id: string, fn: function(Event):void}>} */
   var auth_actions = [
-      { event: 'click', id: 'cancel-connect-button', fn: goHome },
       { event: 'click', id: 'sign-out', fn:remoting.signOut },
       { event: 'click', id: 'token-refresh-error-ok', fn: goHome },
       { event: 'click', id: 'token-refresh-error-sign-in',
         fn: remoting.handleAuthFailureAndRelaunch }
   ];
   registerEventListeners(it2me_actions);
   registerEventListeners(me2me_actions);
   registerEventListeners(host_actions);
   registerEventListeners(auth_actions);
 }
 
 /**
  * Sign the user out of Chromoting by clearing (and revoking, if possible) the
  * OAuth refresh token.
  *
  * Also clear all local storage, to avoid leaking information.
  */
 remoting.signOut = function() {
   remoting.oauth2.removeCachedAuthToken().then(function(){
     chrome.storage.local.clear();
     remoting.setMode(remoting.AppMode.HOME);
     window.location.reload();
   });
 };