Revert 63135 - Update icons to show lowdata and very lowdata for 3G data....

chrome/browser/chromeos/status/network_menu_button.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_button.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "app/l10n_util.h"
@@ skipping 102 matching lines @@
             l10n_util::GetStringF(
                 IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
                 l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)));
       } else if (cros->wifi_connected()) {
         SetIcon(IconForNetworkStrength(
             cros->wifi_network().strength(), false));
         SetTooltipText(l10n_util::GetStringF(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
             UTF8ToWide(cros->wifi_network().name())));
       } else if (cros->cellular_connected()) {
-        const CellularNetwork& cellular = cros->cellular_network();
-        if (cellular.data_left() == CellularNetwork::DATA_NONE) {
-          // If no data, then we show 0 bars.
-          SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
-        } else {
-          SetIcon(IconForNetworkStrength(cellular));
-        }
+        SetIcon(IconForNetworkStrength(
+            cros->cellular_network().strength(), false));
         SetTooltipText(l10n_util::GetStringF(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(cellular.name())));
+            UTF8ToWide(cros->cellular_network().name())));
       } else {
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
         SetTooltipText(l10n_util::GetString(
             IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
       }
     }
 
     if (!cros->Connected() && !cros->Connecting()) {
       SetBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
     } else if (!cros->ethernet_connected() && !cros->wifi_connected() &&
         (cros->cellular_connecting() || cros->cellular_connected())) {
-      int id;
-      switch (cros->cellular_network().data_left()) {
-        case CellularNetwork::DATA_NONE:
-        case CellularNetwork::DATA_VERY_LOW:
-          id = IDR_STATUSBAR_NETWORK_3G_VLOWDATA;
-          break;
-        case CellularNetwork::DATA_LOW:
-          id = IDR_STATUSBAR_NETWORK_3G_LOWDATA;
-          break;
-        case CellularNetwork::DATA_NORMAL:
-          id = IDR_STATUSBAR_NETWORK_3G;
-          break;
-      }
-      SetBadge(*rb.GetBitmapNamed(id));
+      // TODO(chocobo): Check cellular network 3g/edge.
+      SetBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G));
+//      SetBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE));
     } else {
       SetBadge(SkBitmap());
     }
   } else {
     SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
     SetBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_WARNING));
     SetTooltipText(l10n_util::GetString(
         IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
   }
 
   SchedulePaint();
   UpdateMenu();
 }
 
-void NetworkMenuButton::CellularDataPlanChanged(NetworkLibrary* cros) {
-  // Call NetworkChanged which will update the icon.
-  NetworkChanged(cros);
-}
-
 void NetworkMenuButton::SetBadge(const SkBitmap& badge) {
   badge_ = badge;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, NetworkMenu implementation:
 
 bool NetworkMenuButton::IsBrowserMode() const {
   return host_->IsBrowserMode();
 }
 
 gfx::NativeWindow NetworkMenuButton::GetNativeWindow() const {
   return host_->GetNativeWindow();
 }
 
 void NetworkMenuButton::OpenButtonOptions() const {
   host_->OpenButtonOptions(this);
 }
 
 bool NetworkMenuButton::ShouldOpenButtonOptions() const {
   return host_->ShouldOpenButtonOptions(this);
 }
 
 }  // namespace chromeos