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

24 files changed, 49 insertions, 20 deletions

diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index c0e1f31..16a683f 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -164,11 +164,16 @@
         <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" 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_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_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_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_dark.png
new file mode 100644
index 0000000..19f29c5
--- /dev/null
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_dark.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_gprs.png b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_light.png
index d6f08c3..d6f08c3 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_gprs.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_light.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
new file mode 100644
index 0000000..98f87bf
--- /dev/null
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_dark.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_light.png
index fea4d73..fea4d73 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_light.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
new file mode 100644
index 0000000..e344406
--- /dev/null
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_dark.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_light.png
index ed6e3e0..ed6e3e0 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_light.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
new file mode 100644
index 0000000..aacf7ce
--- /dev/null
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_dark.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_light.png
index 0d83587..0d83587 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_light.png
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
new file mode 100644
index 0000000..ce0e246
--- /dev/null
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_dark.png
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_lte.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_light.png
index b777a23..b777a23 100644
--- a/ash/resources/default_100_percent/cros/network/statusbar_network_lte.png
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_light.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
new file mode 100644
index 0000000..b8a2ee7
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_dark.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_gprs.png b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_light.png
index 9161cc0..9161cc0 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_gprs.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_light.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
new file mode 100644
index 0000000..caeab6a
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_dark.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_light.png
index d7ad918..d7ad918 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_light.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
new file mode 100644
index 0000000..5089d57
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_dark.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_light.png
index 82832c8..82832c8 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_light.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
new file mode 100644
index 0000000..97867ff
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_dark.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_light.png
index f964449..f964449 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_light.png
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
new file mode 100644
index 0000000..7d167ce
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_dark.png
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_lte.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_light.png
index 52de0f9..52de0f9 100644
--- a/ash/resources/default_200_percent/cros/network/statusbar_network_lte.png
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_light.png
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;
diff --git a/chrome/browser/chromeos/cros/network_library_impl_stub.cc b/chrome/browser/chromeos/cros/network_library_impl_stub.cc
index 7408651..a271c08 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_stub.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_stub.cc
@@ -311,7 +311,7 @@ void NetworkLibraryImplStub::CompleteCellularInit() {
   cellular1->set_activation_state(ACTIVATION_STATE_ACTIVATED);
   cellular1->set_payment_url(std::string("http://www.google.com"));
   cellular1->set_usage_url(std::string("http://www.google.com"));
-  cellular1->set_network_technology(NETWORK_TECHNOLOGY_EVDO);
+  cellular1->set_network_technology(NETWORK_TECHNOLOGY_LTE);
   AddStubNetwork(cellular1, PROFILE_NONE);
 
   CellularNetwork* cellular2 = new CellularNetwork("/cellular2");
diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index e27fffb..da23268 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -91,7 +91,9 @@ const gfx::ImageSkia* BadgeForNetworkTechnology(
       id = IDR_AURA_UBER_TRAY_NETWORK_1X;
       break;
     case NETWORK_TECHNOLOGY_GPRS:
-      id = IDR_AURA_UBER_TRAY_NETWORK_GPRS;
+      id = (color == NetworkMenuIcon::COLOR_DARK) ?
+          IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_EDGE:
       id = (color == NetworkMenuIcon::COLOR_DARK) ?
@@ -99,24 +101,34 @@ const gfx::ImageSkia* BadgeForNetworkTechnology(
           IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_UMTS:
-      id =  (color == NetworkMenuIcon::COLOR_DARK) ?
+      id = (color == NetworkMenuIcon::COLOR_DARK) ?
           IDR_AURA_UBER_TRAY_NETWORK_3G_DARK :
           IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_HSPA:
-      id = IDR_AURA_UBER_TRAY_NETWORK_HSPA;
+      id = (color == NetworkMenuIcon::COLOR_DARK) ?
+          IDR_AURA_UBER_TRAY_NETWORK_HSPA_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_HSPA_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_HSPA_PLUS:
-      id = IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS;
+      id = (color == NetworkMenuIcon::COLOR_DARK) ?
+          IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_LTE:
-      id = IDR_AURA_UBER_TRAY_NETWORK_LTE;
+      id = (color == NetworkMenuIcon::COLOR_DARK) ?
+          IDR_AURA_UBER_TRAY_NETWORK_LTE_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_LTE_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_LTE_ADVANCED:
-      id = IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED;
+      id = (color == NetworkMenuIcon::COLOR_DARK) ?
+          IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_GSM:
-      id = IDR_AURA_UBER_TRAY_NETWORK_GPRS;
+      id = (color == NetworkMenuIcon::COLOR_DARK) ?
+          IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_UNKNOWN:
       break;