[cros] Fix error message screen hiding when not animated.

chrome/browser/resources/chromeos/login/screen_error_message.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 Offline message screen implementation.
  */
 
 cr.define('login', function() {
   // Screens that should have offline message overlay.
@@ skipping 126 matching lines @@
     },
 
     update: function() {
       chrome.send('loginRequestNetworkState',
                   ['login.ErrorMessageScreen.updateState',
                    'update']);
     },
 
     /**
      * Shows or hides offline message based on network on/offline state.
-     * @param {Integer} state Current state of the network (see NET_STATE).
+     * @param {number} state Current state of the network (see NET_STATE).
      * @param {string} network Name of the current network.
      * @param {string} reason Reason the callback was called.
-     * @param {int} lastNetworkType Last active network type.
+     * @param {number} lastNetworkType Last active network type.
      */
     updateState_: function(state, network, reason, lastNetworkType) {
       var currentScreen = Oobe.getInstance().currentScreen;
       var offlineMessage = this;
       var isOnline = (state == NET_STATE.ONLINE);
       var isUnderCaptivePortal = (state == NET_STATE.PORTAL);
       var isProxyError = reason == ERROR_REASONS.PROXY_AUTH_CANCELLED ||
           reason == ERROR_REASONS.PROXY_CONNECTION_FAILED;
       var shouldOverlay = MANAGED_SCREENS.indexOf(currentScreen.id) != -1 &&
           !currentScreen.isLocal;
@@ skipping 92 matching lines @@
       } else {
         chrome.send('hideCaptivePortal');
 
         if (!offlineMessage.classList.contains('faded')) {
           console.log('Hide offline message. state=' + state +
                       ', network=' + network + ', reason=' + reason);
 
           offlineMessage.onBeforeHide();
 
           offlineMessage.classList.add('faded');
-          offlineMessage.addEventListener('webkitTransitionEnd',
-            function f(e) {
-              offlineMessage.removeEventListener('webkitTransitionEnd', f);
-              if (offlineMessage.classList.contains('faded'))
-                offlineMessage.classList.add('hidden');
-            });
+          if (offlineMessage.classList.contains('animated')) {
+            offlineMessage.addEventListener('webkitTransitionEnd',
+              function f(e) {
+                offlineMessage.removeEventListener('webkitTransitionEnd', f);
+                if (offlineMessage.classList.contains('faded'))
+                  offlineMessage.classList.add('hidden');
+              });
+          } else {
+            offlineMessage.classList.add('hidden');
+          }
 
           currentScreen.classList.remove('hidden');
           currentScreen.classList.remove('faded');
 
           if (Oobe.getInstance().isNewOobe())
             Oobe.getInstance().updateInnerContainerSize_(currentScreen);
 
           // Forces a reload for Gaia screen on hiding error message.
           if (currentScreen.id == 'gaia-signin')
             currentScreen.doReload();
         }
       }
     },
 
     // Request network state update with loading timeout as reason.
     showLoadingTimeoutError: function() {
       // Shows error message if it is not shown already.
       if (this.classList.contains('hidden')) {
         chrome.send('loginRequestNetworkState',
                     ['login.ErrorMessageScreen.updateState',
                      ERROR_REASONS.LOADING_TIMEOUT]);
       }
     }
   };
 
   /**
    * Network state changed callback.
-   * @param {Integer} state Current state of the network (see NET_STATE).
+   * @param {number} state Current state of the network (see NET_STATE).
    * @param {string} network Name of the current network.
    * @param {string} reason Reason the callback was called.
-   * @param {int} lastNetworkType Last active network type.
+   * @param {number} lastNetworkType Last active network type.
    */
   ErrorMessageScreen.updateState = function(
       state, network, reason, lastNetworkType) {
     $('error-message').updateState_(state, network, reason, lastNetworkType);
   };
 
   /**
    * Handler for iframe's error notification coming from the outside.
    * For more info see C++ class 'SnifferObserver' which calls this method.
    * @param {number} error Error code.
@@ skipping 39 matching lines @@
    * via template.
    */
   ErrorMessageScreen.updateLocalizedContent = function() {
     $('error-message').updateLocalizedContent_();
   };
 
   return {
     ErrorMessageScreen: ErrorMessageScreen
   };
 });