Simplifed logic of showing/hiding cancel buttons on login screens.

chrome/browser/resources/chromeos/login/header_bar.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 Login UI header bar implementation.
  */
 
 cr.define('login', function() {
   /**
@@ skipping 36 matching lines @@
       $('shutdown-button').addEventListener('click',
           this.handleShutdownClick_);
       $('restart-header-bar-item').addEventListener('click',
           this.handleShutdownClick_);
       $('restart-button').addEventListener('click',
           this.handleShutdownClick_);
       $('add-user-button').addEventListener('click',
           this.handleAddUserClick_);
       $('more-settings-button').addEventListener('click',
           this.handleMoreSettingsClick_.bind(this));
-      $('cancel-add-user-button').addEventListener('click',
-          this.handleCancelAddUserClick_);
       $('guest-user-header-bar-item').addEventListener('click',
           this.handleGuestClick_);
       $('guest-user-button').addEventListener('click',
           this.handleGuestClick_);
       $('sign-out-user-button').addEventListener('click',
           this.handleSignoutClick_);
       $('cancel-multiple-sign-in-button').addEventListener('click',
           this.handleCancelMultipleSignInClick_);
       $('cancel-consumer-management-enrollment-button').addEventListener(
           'click',
@@ skipping 199 matching lines @@
      */
     get signinUIState() {
       return this.signinUIState_;
     },
     set signinUIState(state) {
       this.signinUIState_ = state;
       this.updateUI_();
     },
 
     /**
-     * Whether the Cancel button is enabled during Gaia sign-in.
-     *
-     * @type {boolean}
-     */
-    set allowCancel(value) {
-      this.allowCancel_ = value;
-      this.updateUI_();
-    },
-
-    get allowCancel() {
-      return !!this.allowCancel_;
-    },
-
-    /**
      * Update whether there are kiosk apps.
      *
      * @type {boolean}
      */
     set hasApps(value) {
       this.hasApps_ = value;
       this.updateUI_();
     },
 
     /**
@@ skipping 33 matching lines @@
           !accountPickerIsActive ||
           isMultiProfilesUI ||
           isLockScreen ||
           errorScreenIsActive;
       $('more-settings-header-bar-item').hidden =
           !this.showCreateSupervised_ ||
           gaiaIsActive ||
           isLockScreen ||
           errorScreenIsActive ||
           supervisedUserCreationDialogIsActive;
-      $('cancel-add-user-button').hidden =
-          !this.allowCancel_ ||
-          gaiaIsActive ||
-          isPasswordChangedUI ||
-          isSamlPasswordConfirm ||
-          errorScreenIsActive ||
-          accountPickerIsActive ||
-          wrongHWIDWarningIsActive ||
-          isMultiProfilesUI ||
-          supervisedUserCreationDialogIsActive;
       $('guest-user-header-bar-item').hidden =
           !this.showGuest_ ||
           isLockScreen ||
           supervisedUserCreationDialogIsActive ||
           wrongHWIDWarningIsActive ||
           isSamlPasswordConfirm ||
           isMultiProfilesUI ||
-          (this.allowCancel_ && gaiaIsActive) ||
+          (gaiaIsActive && $('gaia-signin').cancelable) ||
           enrollmentIsActiveWithBackButton ||
           gaiaIsActiveWithBackButton;
       $('restart-header-bar-item').hidden = !this.showReboot_;
       $('shutdown-header-bar-item').hidden = !this.showShutdown_;
       $('sign-out-user-item').hidden = !isLockScreen;
 
-      $('add-user-header-bar-item').hidden =
-          $('add-user-button').hidden && $('cancel-add-user-button').hidden;
+      $('add-user-header-bar-item').hidden = $('add-user-button').hidden;
       $('apps-header-bar-item').hidden = !this.hasApps_ ||
           (!gaiaIsActive && !accountPickerIsActive);
       $('cancel-multiple-sign-in-item').hidden = !isMultiProfilesUI;
       $('cancel-consumer-management-enrollment').hidden =
           !isEnrollingConsumerManagement;
 
       if (!Oobe.getInstance().newKioskUI) {
         if (!$('apps-header-bar-item').hidden)
           $('show-apps-button').didShow();
       }
@@ skipping 61 matching lines @@
    * Convenience wrapper of animateIn.
    */
   HeaderBar.animateIn = function(fast, callback) {
     $('login-header-bar').animateIn(fast, callback);
   };
 
   return {
     HeaderBar: HeaderBar
   };
 });