Revert 64888 - Push for ers:...

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2010 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.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/stringprintf.h"
@@ skipping 371 matching lines @@
       images = kBarsImagesLowData;
       break;
     case CellularNetwork::DATA_NORMAL:
       images = kBarsImages;
       break;
   }
   return *ResourceBundle::GetSharedInstance().GetBitmapNamed(images[index]);
 }
 
 // static
-// TODO(ers) update for GSM when we have the necessary images
-SkBitmap NetworkMenu::BadgeForNetworkTechnology(
-    const CellularNetwork* cellular) {
-
-    int id;
-    if (cellular->network_technology() == NETWORK_TECHNOLOGY_EVDO) {
-      switch (cellular->data_left()) {
-        case CellularNetwork::DATA_NONE:
-        case CellularNetwork::DATA_VERY_LOW:
-          id = IDR_STATUSBAR_NETWORK_3G_ERROR;
-          break;
-        case CellularNetwork::DATA_LOW:
-          id = IDR_STATUSBAR_NETWORK_3G_WARN;
-          break;
-        case CellularNetwork::DATA_NORMAL:
-          id = IDR_STATUSBAR_NETWORK_3G;
-          break;
-      }
-    } else if (cellular->network_technology() == NETWORK_TECHNOLOGY_1XRTT) {
-      switch (cellular->data_left()) {
-        case CellularNetwork::DATA_NONE:
-        case CellularNetwork::DATA_VERY_LOW:
-          id = IDR_STATUSBAR_NETWORK_1X_ERROR;
-          break;
-        case CellularNetwork::DATA_LOW:
-          id = IDR_STATUSBAR_NETWORK_1X_WARN;
-          break;
-        case CellularNetwork::DATA_NORMAL:
-          id = IDR_STATUSBAR_NETWORK_1X;
-          break;
-      }
-    } else {
-      id = -1;
-    }
-    if (id == -1)
-      return SkBitmap();
-    else
-      return *ResourceBundle::GetSharedInstance().GetBitmapNamed(id);
-}
-
-// static
 SkBitmap NetworkMenu::IconForDisplay(SkBitmap icon, SkBitmap badge) {
   // Draw badge at (14,14).
   static const int kBadgeX = 14;
   static const int kBadgeY = 14;
 
   gfx::CanvasSkia canvas(icon.width(), icon.height(), false);
   canvas.DrawBitmapInt(icon, 0, 0);
   if (!badge.empty())
     canvas.DrawBitmapInt(badge, kBadgeX, kBadgeY);
   return canvas.ExtractBitmap();
@@ skipping 120 matching lines @@
       } else if (cell_networks[i]->connecting()) {
         label = l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_DEVICE_STATUS,
             ASCIIToUTF16(cell_networks[i]->name()),
             l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING));
       } else {
         label = ASCIIToUTF16(cell_networks[i]->name());
       }
       SkBitmap icon = IconForNetworkStrength(cell_networks[i]->strength(),
                                              true);
-      SkBitmap badge = BadgeForNetworkTechnology(cell_networks[i]);
+      // TODO(chocobo): Check cellular network 3g/edge.
+      SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G);
+      // SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE);
       int flag = FLAG_CELLULAR;
       if (active_cellular &&
           cell_networks[i]->service_path() ==
               active_cellular->service_path() &&
           (cell_networks[i]->connecting() || cell_networks[i]->connected()))
         flag |= FLAG_ASSOCIATED;
       menu_items_.push_back(
           MenuItem(menus::MenuModel::TYPE_COMMAND, label,
                    IconForDisplay(icon, badge),
                    cell_networks[i]->service_path(), flag));
@@ skipping 140 matching lines @@
                                       chromeos::TYPE_WIFI);
       browser->ShowOptionsTab(page);
     }
   } else {
     const bool kFocusLogin = true;
     ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin);
   }
 }
 
 }  // namespace chromeos