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

chrome/browser/chromeos/status/network_menu_icon.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_
 #pragma once
 
 #include <string>
 #include <map>
@@ skipping 23 matching lines @@
     BARS
   };
 
   class Delegate {
    public:
     // Called when the bitmap has changed due to animation. Callback should
     // trigger a call to GetIconAndText() to generate and retrieve the bitmap.
     virtual void NetworkMenuIconChanged() = 0;
   };
 
-  NetworkMenuIcon(Delegate* delegate, Mode mode);
+  NetworkMenuIcon(Delegate* delegate, Mode mode,
+                  ConnectionType last_network_type);

[stevenjb, 2011/11/28 19:35:45]

This is non-intuitive in the constructor; my first impression was that it was
limiting the icon somehow. I would rather see a setter added instead.

[altimofeev, 2011/11/29 17:10:46]

Done.

   virtual ~NetworkMenuIcon();
 
   // Generates and returns the icon bitmap. This will never return NULL.
   // Also sets |text| if not NULL. Behavior varies depending on |mode_|.
   const SkBitmap GetIconAndText(string16* text);
 
   // ui::AnimationDelegate implementation.
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   // Static functions for generating network icon bitmaps:
@@ skipping 45 matching lines @@
   ConnectionType last_network_type_;
   scoped_ptr<NetworkIcon> icon_;
   const Network* connecting_network_;  // weak pointer.
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenuIcon);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_