diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 02:49:34 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 02:49:34 +0000 |
| commit | 62f02416c5b7e95081571f053f68ad519e2205b0 (patch) | |
| tree | c84dcdfd71b6692fdbcc162fe42cf217862b5ff1 /ash/system | |
| parent | ccc5ffdba758e05239222ca36551c67ec79df1db (diff) | |
| download | chromium_src-62f02416c5b7e95081571f053f68ad519e2205b0.zip chromium_src-62f02416c5b7e95081571f053f68ad519e2205b0.tar.gz chromium_src-62f02416c5b7e95081571f053f68ad519e2205b0.tar.bz2 | |
Add 'dark' lte icons.
Add 'dark' versions for the LTE/HSPA/GPRS icons so that we show them correctly on the network list.
R=stevenjb@chromium.org
BUG=169969
Review URL: https://codereview.chromium.org/11975029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/chromeos/network/network_icon.cc | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/ash/system/chromeos/network/network_icon.cc b/ash/system/chromeos/network/network_icon.cc index 9974721..ca69121 100644 --- a/ash/system/chromeos/network/network_icon.cc +++ b/ash/system/chromeos/network/network_icon.cc @@ -302,25 +302,37 @@ const gfx::ImageSkia* BadgeForNetworkTechnology(const NetworkState* network, } else if (network->technology() == flimflam::kNetworkTechnology1Xrtt) { id = IDR_AURA_UBER_TRAY_NETWORK_1X; } else if (network->technology() == flimflam::kNetworkTechnologyGprs) { - id = IDR_AURA_UBER_TRAY_NETWORK_GPRS; + id = (color == COLOR_DARK) ? + IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK : + IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT; } else if (network->technology() == flimflam::kNetworkTechnologyEdge) { id = (color == COLOR_DARK) ? IDR_AURA_UBER_TRAY_NETWORK_EDGE_DARK : IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT; } else if (network->technology() == flimflam::kNetworkTechnologyUmts) { - id = (color == COLOR_DARK) ? + id = (color == COLOR_DARK) ? IDR_AURA_UBER_TRAY_NETWORK_3G_DARK : IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT; } else if (network->technology() == flimflam::kNetworkTechnologyHspa) { - id = IDR_AURA_UBER_TRAY_NETWORK_HSPA; + id = (color == COLOR_DARK) ? + IDR_AURA_UBER_TRAY_NETWORK_HSPA_DARK : + IDR_AURA_UBER_TRAY_NETWORK_HSPA_LIGHT; } else if (network->technology() == flimflam::kNetworkTechnologyHspaPlus) { - id = IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS; + id = (color == COLOR_DARK) ? + IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_DARK : + IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_LIGHT; } else if (network->technology() == flimflam::kNetworkTechnologyLte) { - id = IDR_AURA_UBER_TRAY_NETWORK_LTE; + id = (color == COLOR_DARK) ? + IDR_AURA_UBER_TRAY_NETWORK_LTE_DARK : + IDR_AURA_UBER_TRAY_NETWORK_LTE_LIGHT; } else if (network->technology() == flimflam::kNetworkTechnologyLteAdvanced) { - id = IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED; + id = (color == COLOR_DARK) ? + IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_DARK : + IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_LIGHT; } else if (network->technology() == flimflam::kNetworkTechnologyGsm) { - id = IDR_AURA_UBER_TRAY_NETWORK_GPRS; + id = (color == COLOR_DARK) ? + IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK : + IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT; } if (id == kUnknownBadgeType) return NULL; |