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

chrome/browser/chromeos/status/network_menu_icon.cc

 // 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.
 
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/utf_string_conversions.h"
@@ skipping 434 matching lines @@
   const Network* connected_network_;  // weak pointer; used for VPN icons.
   NetworkRoamingState roaming_state_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkIcon);
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuIcon
 
-NetworkMenuIcon::NetworkMenuIcon(Delegate* delegate, Mode mode)
+NetworkMenuIcon::NetworkMenuIcon(Delegate* delegate, Mode mode,
+                                 ConnectionType last_network_type)
     : mode_(mode),
       delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)),
-      last_network_type_(TYPE_WIFI),
+      last_network_type_(last_network_type),
       connecting_network_(NULL) {
   // Generate empty images for blending.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const SkBitmap* vpn_badge = rb.GetBitmapNamed(kVpnBadgeId);
   empty_vpn_badge_.setConfig(SkBitmap::kARGB_8888_Config,
                              vpn_badge->width(), vpn_badge->height(), 0);
   empty_vpn_badge_.allocPixels();
   empty_vpn_badge_.eraseARGB(0, 0, 0, 0);
 
   // Set up the connection animation throbber.
@@ skipping 326 matching lines @@
 
 const SkBitmap NetworkMenuIcon::GetConnectedBitmap(BitmapType type) {
   return GetBitmap(type, NumBitmaps(type) - 1);
 }
 
 int NetworkMenuIcon::NumBitmaps(BitmapType type) {
   return (type == ARCS) ? kNumArcsImages : kNumBarsImages;
 }
 
 }  // chromeos