diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 07:59:28 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 07:59:28 +0000 |
| commit | f2b54b488466b4b92a8312cfd5be1cf95b2733ba (patch) | |
| tree | 6b8f0e49c8b24cf6801fa60869fb3dd6bce5c0b8 /ash | |
| parent | f84a2e2a4e478e6e372b83c899a4f3f445cdd35e (diff) | |
| download | chromium_src-f2b54b488466b4b92a8312cfd5be1cf95b2733ba.zip chromium_src-f2b54b488466b4b92a8312cfd5be1cf95b2733ba.tar.gz chromium_src-f2b54b488466b4b92a8312cfd5be1cf95b2733ba.tar.bz2 | |
Fix wimax badges for status area
BUG=237655
Review URL: https://chromiumcodereview.appspot.com/14890006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/chromeos/network/network_icon.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/system/chromeos/network/network_icon.cc b/ash/system/chromeos/network/network_icon.cc index 6fc3ebc..6ac05a7 100644 --- a/ash/system/chromeos/network/network_icon.cc +++ b/ash/system/chromeos/network/network_icon.cc @@ -252,9 +252,9 @@ gfx::ImageSkia* BaseImageForType(ImageType image_type, IconType icon_type) { } ImageType ImageTypeForNetworkType(const std::string& type) { - if (type == flimflam::kTypeWifi || type == flimflam::kTypeWimax) + if (type == flimflam::kTypeWifi) return ARCS; - else if (type == flimflam::kTypeCellular) + else if (type == flimflam::kTypeCellular || type == flimflam::kTypeWimax) return BARS; return NONE; } @@ -571,7 +571,7 @@ void NetworkIconImpl::GetBadges(const NetworkState* network, Badges* badges) { IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK); } } else if (type == flimflam::kTypeWimax) { - badges->top_left = rb.GetImageSkiaNamed( + technology_badge_ = rb.GetImageSkiaNamed( IconTypeIsDark(icon_type_) ? IDR_AURA_UBER_TRAY_NETWORK_4G_DARK : IDR_AURA_UBER_TRAY_NETWORK_4G_LIGHT); |