[cros] Make disconnected icons used by network drop-down and network button consistent.

chrome/browser/resources/chromeos/login/screen_error_message.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 Offline message screen implementation.
  */
 
 cr.define('login', function() {
   // Screens that should have offline message overlay.
@@ skipping 49 matching lines @@
 
     /** @inheritDoc */
     decorate: function() {
       chrome.send('loginAddNetworkStateObserver',
                   ['login.ErrorMessageScreen.updateState']);
 
       cr.ui.DropDown.decorate($('offline-networks-list'));
       this.updateLocalizedContent_();
     },
 
-    onBeforeShow: function() {
-      cr.ui.DropDown.setActive('offline-networks-list', true, false);
-
-      $('error-guest-signin').hidden = $('guestSignin').hidden ||
-          !$('add-user-header-bar-item').hidden;
-    },
-
-    onBeforeHide: function() {
-      cr.ui.DropDown.setActive('offline-networks-list', false, false);
-    },
-
-    update: function() {
-      chrome.send('loginRequestNetworkState',
-                  ['login.ErrorMessageScreen.updateState',
-                   'update']);
-    },
-
     /**
      * Updates localized content of the screen that is not updated via template.
      */
     updateLocalizedContent_: function() {
       $('captive-portal-message-text').innerHTML = localStrings.getStringF(
         'captivePortalMessage',
         '<b id="' + CURRENT_NETWORK_NAME_ID + '"></b>',
         '<a id="' + FIX_CAPTIVE_PORTAL_ID + '" class="signin-link" href="#">',
         '</a>');
       $(FIX_CAPTIVE_PORTAL_ID).onclick = function() {
@@ skipping 13 matching lines @@
       // TODO(altimofeev): Support offline sign-in as well.
       $('error-guest-signin').innerHTML = localStrings.getStringF(
           'guestSignin',
           '<a id="error-guest-signin-link" class="signin-link" href="#">',
           '</a>');
       $('error-guest-signin-link').onclick = function() {
         chrome.send('launchIncognito');
       };
     },
 
+    onBeforeShow: function(lastNetworkType) {
+      cr.ui.DropDown.show('offline-networks-list', false, lastNetworkType);
+
+      $('error-guest-signin').hidden = $('guestSignin').hidden ||
+          !$('add-user-header-bar-item').hidden;
+    },
+
+    onBeforeHide: function() {
+      cr.ui.DropDown.hide('offline-networks-list');
+    },
+
+    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 {string} network Name of the current network.
+     * @param {string} reason Reason the callback was called.
+     * @param {int} lastNetworkType Last active network type.
      */
-    updateState_: function(state, network, reason) {
+    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;
 
       if (reason == 'proxy changed' && shouldOverlay &&
           !offlineMessage.classList.contains('hidden') &&
           offlineMessage.classList.contains('show-captive-portal')) {
         // Schedules a immediate retry.
         currentScreen.doReload();
         console.log('Retry page load since proxy settings has been changed');
       }
 
       if (!isOnline && shouldOverlay) {
         console.log('Show offline message, state=' + state +
                     ', network=' + network +
                     ', isUnderCaptivePortal=' + isUnderCaptivePortal);
-        offlineMessage.onBeforeShow();
+        offlineMessage.onBeforeShow(lastNetworkType);
 
         if (isUnderCaptivePortal) {
           if (isProxyError) {
             offlineMessage.classList.remove('show-offline-message');
             offlineMessage.classList.remove('show-captive-portal');
             offlineMessage.classList.add('show-proxy-error');
           } else {
             $(CURRENT_NETWORK_NAME_ID).textContent = network;
             offlineMessage.classList.remove('show-offline-message');
             offlineMessage.classList.remove('show-proxy-error');
@@ skipping 35 matching lines @@
         }
       }
     },
   };
 
   /**
    * Network state changed callback.
    * @param {Integer} 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.
    */
-  ErrorMessageScreen.updateState = function(state, network, reason) {
-    $('error-message').updateState_(state, network, reason);
+  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.
    */
   ErrorMessageScreen.onFrameError = function(error) {
     console.log('Gaia frame error = ' + error);
     if (error == NET_ERROR.ABORTED_BY_USER) {
@@ skipping 39 matching lines @@
    * via template.
    */
   ErrorMessageScreen.updateLocalizedContent = function() {
     $('error-message').updateLocalizedContent_();
   };
 
   return {
     ErrorMessageScreen: ErrorMessageScreen
   };
 });