diff options
| author | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 23:06:17 +0000 |
|---|---|---|
| committer | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 23:06:17 +0000 |
| commit | c7e162722290bdc92c58a0e975fae0b4e0718a92 (patch) | |
| tree | 7c51842de3eee4a607157fd0e29b7b69a6e56bcf | |
| parent | 1ee62bbac06097c162f0fbcb47e28edc714c9a5d (diff) | |
| download | chromium_src-c7e162722290bdc92c58a0e975fae0b4e0718a92.zip chromium_src-c7e162722290bdc92c58a0e975fae0b4e0718a92.tar.gz chromium_src-c7e162722290bdc92c58a0e975fae0b4e0718a92.tar.bz2 | |
Don't change network menu color for 3g.
BUG=chromium-os:9438
TESt=Manual
Review URL: http://codereview.chromium.org/5124005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66835 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/status/network_menu.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index ff2d255..c32854a 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -395,19 +395,17 @@ SkBitmap NetworkMenu::IconForNetworkStrength(int strength, bool black) { // static SkBitmap NetworkMenu::IconForNetworkStrength(const CellularNetwork* cellular) { DCHECK(cellular); - // Compose wifi icon by superimposing various icons. + // Compose cellular icon by superimposing various icons. int index = static_cast<int>(cellular->strength() / 100.0 * nextafter(static_cast<float>(kNumWifiImages), 0)); index = std::max(std::min(index, kNumWifiImages - 1), 0); const int* images = kBarsImages; switch (cellular->GetDataLeft()) { case CellularNetwork::DATA_NONE: - case CellularNetwork::DATA_VERY_LOW: images = kBarsImagesVLowData; break; + case CellularNetwork::DATA_VERY_LOW: case CellularNetwork::DATA_LOW: - images = kBarsImagesLowData; - break; case CellularNetwork::DATA_NORMAL: images = kBarsImages; break; @@ -440,12 +438,10 @@ SkBitmap NetworkMenu::BadgeForNetworkTechnology( if (cellular->network_technology() == NETWORK_TECHNOLOGY_EVDO) { switch (cellular->GetDataLeft()) { case CellularNetwork::DATA_NONE: - case CellularNetwork::DATA_VERY_LOW: id = IDR_STATUSBAR_NETWORK_3G_ERROR; break; + case CellularNetwork::DATA_VERY_LOW: case CellularNetwork::DATA_LOW: - id = IDR_STATUSBAR_NETWORK_3G_WARN; - break; case CellularNetwork::DATA_NORMAL: id = IDR_STATUSBAR_NETWORK_3G; break; @@ -453,18 +449,14 @@ SkBitmap NetworkMenu::BadgeForNetworkTechnology( } else if (cellular->network_technology() == NETWORK_TECHNOLOGY_1XRTT) { switch (cellular->GetDataLeft()) { case CellularNetwork::DATA_NONE: - case CellularNetwork::DATA_VERY_LOW: id = IDR_STATUSBAR_NETWORK_1X_ERROR; break; + case CellularNetwork::DATA_VERY_LOW: 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(); |