Fix network menu and settings page to show consisten icon for connecting to other network. We now show full bars instead of just 1 bar.

BUG=chromium-os:19957
TEST=manually check to see that the icons look right
Review URL: http://codereview.chromium.org/8343015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106161 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 7 deletions

diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index d47199e..037818d 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -603,9 +603,7 @@ void MainMenuModel::InitMenuItems(bool is_browser_mode,
     menu_items_.push_back(MenuItem(
         ui::MenuModel::TYPE_COMMAND,
         l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS),
-        NetworkMenuIcon::GetBitmap(
-            NetworkMenuIcon::ARCS,
-            NetworkMenuIcon::NumBitmaps(NetworkMenuIcon::ARCS)),
+        NetworkMenuIcon::GetConnectedBitmap(NetworkMenuIcon::ARCS),
         std::string(), FLAG_ADD_WIFI));
   }
 
diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index 18c2902..d6f1da0 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -606,11 +606,11 @@ void NetworkMenuIcon::SetIconAndText(string16* text) {
           rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
       break;
     case TYPE_WIFI:
-      icon_->set_icon(GetBitmap(ARCS, 0));
+      icon_->set_icon(GetDisconnectedBitmap(ARCS));
       break;
     case TYPE_CELLULAR:
     default:
-      icon_->set_icon(GetBitmap(BARS, 0));
+      icon_->set_icon(GetDisconnectedBitmap(BARS));
       icon_->set_bottom_right_badge(
           rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
       break;
@@ -755,6 +755,10 @@ const SkBitmap NetworkMenuIcon::GetDisconnectedBitmap(BitmapType type) {
   return GetBitmap(type, 0);
 }
 
+const SkBitmap NetworkMenuIcon::GetConnectedBitmap(BitmapType type) {
+  return GetBitmap(type, NumBitmaps(type) - 1);
+}
+
 int NetworkMenuIcon::NumBitmaps(BitmapType type) {
   return (type == ARCS) ? kNumArcsImages : kNumBarsImages;
 }
diff --git a/chrome/browser/chromeos/status/network_menu_icon.h b/chrome/browser/chromeos/status/network_menu_icon.h
index bcb1907..f5d5343 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.h
+++ b/chrome/browser/chromeos/status/network_menu_icon.h
@@ -73,7 +73,14 @@ class NetworkMenuIcon : public ui::AnimationDelegate {
   // Access a specific bitmap. If index is out of range an empty bitmap
   // will be returned.
   static const SkBitmap GetBitmap(BitmapType type, int index);
+
+  // Gets the disconnected bitmap for given type.
   static const SkBitmap GetDisconnectedBitmap(BitmapType type);
+
+  // Gets the connected bitmap for given type.
+  static const SkBitmap GetConnectedBitmap(BitmapType type);
+
+  // Returns total number of bitmaps for given type.
   static int NumBitmaps(BitmapType type);
 
  protected:
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 45e5525..7f1399f 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -1181,8 +1181,8 @@ ListValue* InternetOptionsHandler::GetWirelessList() {
   if (cros_->wifi_enabled()) {
     list->Append(GetNetwork(
         kOtherNetworksFakePath,
-        chromeos::NetworkMenuIcon::GetBitmap(
-            chromeos::NetworkMenuIcon::ARCS, 1),
+        chromeos::NetworkMenuIcon::GetConnectedBitmap(
+            chromeos::NetworkMenuIcon::ARCS),
         l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS),
         false,
         false,