When connected to LTE, show the LTE icon.

In the data notification, when connected to LTE, show the LTE icon, not the 3g icon. Also fix the LTE icons in the tray to look clearer.

R=stevenjb@chromium.org,benchan@chromium.org,zelidrag@chromium.org
BUG=169969

Review URL: https://codereview.chromium.org/11889024

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

17 files changed, 6 insertions, 1 deletions

diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 7d5b4f2..c0e1f31 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -141,6 +141,7 @@
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="common/status_network_info.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="common/status_network_info_h.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICATION_3G" file="common/notification_3g.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICATION_LTE" file="common/notification_lte.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="common/status_power_small_all.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="common/status_power_small_all_dark.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="common/status_settings.png" />
diff --git a/ash/resources/default_100_percent/common/notification_3g.png b/ash/resources/default_100_percent/common/notification_3g.png
index c86599e..7a5e3f5 100644
--- a/ash/resources/default_100_percent/common/notification_3g.png
+++ b/ash/resources/default_100_percent/common/notification_3g.png
diff --git a/ash/resources/default_100_percent/common/notification_lte.png b/ash/resources/default_100_percent/common/notification_lte.png
new file mode 100644
index 0000000..146db1d
--- /dev/null
+++ b/ash/resources/default_100_percent/common/notification_lte.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.png
index 4d13802..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.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.png
index 65b2c8c..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.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.png
index 7eab17a..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.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.png
index f27cdc1..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.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.png
index 2813bbc..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.png
diff --git a/ash/resources/default_200_percent/common/notification_3g.png b/ash/resources/default_200_percent/common/notification_3g.png
new file mode 100644
index 0000000..3e2cd52
--- /dev/null
+++ b/ash/resources/default_200_percent/common/notification_3g.png
diff --git a/ash/resources/default_200_percent/common/notification_lte.png b/ash/resources/default_200_percent/common/notification_lte.png
new file mode 100644
index 0000000..2207cea
--- /dev/null
+++ b/ash/resources/default_200_percent/common/notification_lte.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.png
new file mode 100644
index 0000000..9161cc0
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs.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.png
new file mode 100644
index 0000000..d7ad918
--- /dev/null
+++ 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_plus.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus.png
new file mode 100644
index 0000000..82832c8
--- /dev/null
+++ 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_lte.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte.png
new file mode 100644
index 0000000..52de0f9
--- /dev/null
+++ 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.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced.png
new file mode 100644
index 0000000..f964449
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced.png
diff --git a/ash/system/chromeos/network/network_observer.h b/ash/system/chromeos/network/network_observer.h
index 3b43a71..f5dfbf9 100644
--- a/ash/system/chromeos/network/network_observer.h
+++ b/ash/system/chromeos/network/network_observer.h
@@ -33,6 +33,7 @@ class NetworkObserver {
     // ash relevant subset of network_constants.h connection type.
     NETWORK_ETHERNET,
     NETWORK_CELLULAR,
+    NETWORK_CELLULAR_LTE,
     NETWORK_WIFI,
     NETWORK_BLUETOOTH,
     NETWORK_UNKNOWN,
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 41118c0..54c2ed0 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -44,7 +44,10 @@ int GetMessageIcon(
       else
         return IDR_AURA_UBER_TRAY_NETWORK_FAILED;
     case TrayNetwork::MESSAGE_DATA_PROMO:
-      return IDR_AURA_UBER_TRAY_NOTIFICATION_3G;
+      if (network_type == TrayNetwork::NETWORK_CELLULAR_LTE)
+        return IDR_AURA_UBER_TRAY_NOTIFICATION_LTE;
+      else
+        return IDR_AURA_UBER_TRAY_NOTIFICATION_3G;
   }
   NOTREACHED();
   return 0;