Revert 177323

> 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

TBR=rkc@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177362 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 12 insertions, 29 deletions

diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 16a683f..c0e1f31 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -164,16 +164,11 @@
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_LIGHT" file="cros/network/statusbar_network_bars_light.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_DARK" file="cros/network/statusbar_network_edge_dark.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT" file="cros/network/statusbar_network_edge_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK" file="cros/network/statusbar_network_gprs_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT" file="cros/network/statusbar_network_gprs_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_DARK" file="cros/network/statusbar_network_hspa_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_LIGHT" file="cros/network/statusbar_network_hspa_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_DARK" file="cros/network/statusbar_network_hspa_plus_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_LIGHT" file="cros/network/statusbar_network_hspa_plus_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_DARK" file="cros/network/statusbar_network_lte_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_LIGHT" file="cros/network/statusbar_network_lte_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_DARK" file="cros/network/statusbar_network_lte_advanced_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_LIGHT" file="cros/network/statusbar_network_lte_advanced_light.png" />
+        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_GPRS" file="cros/network/statusbar_network_gprs.png" />
+        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA" file="cros/network/statusbar_network_hspa.png" />
+        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS" file="cros/network/statusbar_network_hspa_plus.png" />
+        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE" file="cros/network/statusbar_network_lte.png" />
+        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED" file="cros/network/statusbar_network_lte_advanced.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK" file="cros/network/statusbar_network_roaming_dark.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT" file="cros/network/statusbar_network_roaming_light.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK" file="cros/network/statusbar_network_secure_dark.png" />
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs.png
index d6f08c3..d6f08c3 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_light.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_dark.png
deleted file mode 100644
index 19f29c5..0000000
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_dark.png
+++ /dev/null
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa.png
index fea4d73..fea4d73 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_light.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_dark.png
deleted file mode 100644
index 98f87bf..0000000
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_dark.png
+++ /dev/null
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus.png
index ed6e3e0..ed6e3e0 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_light.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_dark.png
deleted file mode 100644
index e344406..0000000
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_dark.png
+++ /dev/null
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte.png
index b777a23..b777a23 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_light.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_lte.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced.png
index 0d83587..0d83587 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_light.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_dark.png
deleted file mode 100644
index aacf7ce..0000000
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_dark.png
+++ /dev/null
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_dark.png
deleted file mode 100644
index ce0e246..0000000
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_dark.png
+++ /dev/null
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs.png
index 9161cc0..9161cc0 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_light.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_dark.png
deleted file mode 100644
index b8a2ee7..0000000
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_dark.png
+++ /dev/null
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa.png
index d7ad918..d7ad918 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_light.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_dark.png
deleted file mode 100644
index caeab6a..0000000
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_dark.png
+++ /dev/null
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus.png
index 82832c8..82832c8 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_light.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_dark.png
deleted file mode 100644
index 5089d57..0000000
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_dark.png
+++ /dev/null
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte.png
index 52de0f9..52de0f9 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_light.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_lte.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced.png
index f964449..f964449 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_light.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_dark.png
deleted file mode 100644
index 97867ff..0000000
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_dark.png
+++ /dev/null
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_dark.png
deleted file mode 100644
index 7d167ce..0000000
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_dark.png
+++ /dev/null
diff --git a/ash/system/chromeos/network/network_icon.cc b/ash/system/chromeos/network/network_icon.cc
index ca69121..9974721 100644
--- a/ash/system/chromeos/network/network_icon.cc
+++ b/ash/system/chromeos/network/network_icon.cc
@@ -302,37 +302,25 @@ 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 = (color == COLOR_DARK) ?
-        IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK :
-        IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT;
+    id = IDR_AURA_UBER_TRAY_NETWORK_GPRS;
   } 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 = (color == COLOR_DARK) ?
-        IDR_AURA_UBER_TRAY_NETWORK_HSPA_DARK :
-        IDR_AURA_UBER_TRAY_NETWORK_HSPA_LIGHT;
+    id = IDR_AURA_UBER_TRAY_NETWORK_HSPA;
   } else if (network->technology() == flimflam::kNetworkTechnologyHspaPlus) {
-    id = (color == COLOR_DARK) ?
-        IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_DARK :
-        IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_LIGHT;
+    id = IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS;
   } else if (network->technology() == flimflam::kNetworkTechnologyLte) {
-    id = (color == COLOR_DARK) ?
-        IDR_AURA_UBER_TRAY_NETWORK_LTE_DARK :
-        IDR_AURA_UBER_TRAY_NETWORK_LTE_LIGHT;
+    id = IDR_AURA_UBER_TRAY_NETWORK_LTE;
   } else if (network->technology() == flimflam::kNetworkTechnologyLteAdvanced) {
-    id = (color == COLOR_DARK) ?
-        IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_DARK :
-        IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_LIGHT;
+    id = IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED;
   } else if (network->technology() == flimflam::kNetworkTechnologyGsm) {
-    id = (color == COLOR_DARK) ?
-        IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK :
-        IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT;
+    id = IDR_AURA_UBER_TRAY_NETWORK_GPRS;
   }
   if (id == kUnknownBadgeType)
     return NULL;