Update network resources. Adds missing high DPI resources and light themed network badges.

BUG=131852
TEST=NetworkMenuIconTest + Manually.


Review URL: https://chromiumcodereview.appspot.com/10703082

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

9 files changed, 42 insertions, 24 deletions

diff --git a/chrome/app/theme/default_100_percent/statusbar_network_3g.png b/chrome/app/theme/default_100_percent/statusbar_network_3g.png
deleted file mode 100644
index 49113b5..0000000
--- a/chrome/app/theme/default_100_percent/statusbar_network_3g.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/statusbar_network_4g.png b/chrome/app/theme/default_100_percent/statusbar_network_4g.png
deleted file mode 100644
index b906218..0000000
--- a/chrome/app/theme/default_100_percent/statusbar_network_4g.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/statusbar_network_edge.png b/chrome/app/theme/default_100_percent/statusbar_network_edge.png
deleted file mode 100644
index 7867ab8..0000000
--- a/chrome/app/theme/default_100_percent/statusbar_network_edge.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/statusbar_network_roaming.png b/chrome/app/theme/default_100_percent/statusbar_network_roaming.png
deleted file mode 100644
index 04dca97..0000000
--- a/chrome/app/theme/default_100_percent/statusbar_network_roaming.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 36ed7e1..0ac925c 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -296,7 +296,6 @@
         <include name="IDR_NETWORK_SHOW_PASSWORD_OFF" file="default_100_percent/network_show_password_off.png" type="BINDATA" />
         <include name="IDR_NETWORK_SHOW_PASSWORD_ON" file="default_100_percent/network_show_password_on.png" type="BINDATA" />
         <include name="IDR_NETWORK_SHOW_PASSWORD_HOVER" file="default_100_percent/network_show_password_hover.png" type="BINDATA" />
-        <include name="IDR_STATUSBAR_NETWORK_4G" file="default_100_percent/statusbar_network_4g.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_3G" file="default_100_percent/notification_3g.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_BARS_EMPTY" file="default_100_percent/notification_bars_empty.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_BARS_CRITICAL" file="default_100_percent/notification_bars_critical.png" type="BINDATA" />
@@ -316,7 +315,6 @@
         <include name="IDR_PROFILE_PICTURE_LOADING" file="default_100_percent/profile_loading.png" type="BINDATA" />
         <include name="IDR_SHUTDOWN_ICON" file="default_100_percent/shutdown_icon.png" type="BINDATA" />
         <include name="IDR_SPINNER" file="default_100_percent/spinner.png" type="BINDATA" />
-        <include name="IDR_STATUSBAR_NETWORK_3G" file="default_100_percent/statusbar_network_3g.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_3G_WARN" file="default_100_percent/statusbar_network_3g_warn.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_3G_ERROR" file="default_100_percent/statusbar_network_3g_error.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_3G_UNKNOWN" file="default_100_percent/statusbar_network_3g_unknown.png" type="BINDATA" />
@@ -326,13 +324,11 @@
         <include name="IDR_STATUSBAR_NETWORK_ARCS" file="default_100_percent/statusbar_network_arcs.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_BARS" file="default_100_percent/statusbar_network_bars.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_DISCONNECTED" file="default_100_percent/statusbar_network_disconnected.png" type="BINDATA" />
-        <include name="IDR_STATUSBAR_NETWORK_EDGE" file="default_100_percent/statusbar_network_edge.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_HSPA" file="default_100_percent/statusbar_network_hspa.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_HSPA_PLUS" file="default_100_percent/statusbar_network_hspa_plus.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_LTE" file="default_100_percent/statusbar_network_lte.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_LTE_ADVANCED" file="default_100_percent/statusbar_network_lte_advanced.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_GPRS" file="default_100_percent/statusbar_network_gprs.png" type="BINDATA" />
-        <include name="IDR_STATUSBAR_NETWORK_ROAMING" file="default_100_percent/statusbar_network_roaming.png" type="BINDATA" />
         <include name="IDR_USER_IMAGE_NO_VIDEO" file="default_100_percent/no_video.png" type="BINDATA" />
         <include name="IDR_USER_IMAGE_CAPTURE" file="default_100_percent/snapshot_wide.png" type="BINDATA" />
         <include name="IDR_USER_IMAGE_RECYCLE" file="default_100_percent/discard_wide.png" type="BINDATA" />
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 18b8a00..957265a 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -372,11 +372,20 @@
       <structure type="chrome_scaled_image" name="IDR_STAR" file="star.png" />
       <structure type="chrome_scaled_image" name="IDR_STAR_LIT" file="star_lit.png" />
       <if expr="pp_ifdef('chromeos')">
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_3G_DARK" file="statusbar_network_3g_dark.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_3G_LIGHT" file="statusbar_network_3g_light.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_4G_DARK" file="statusbar_network_4g_dark.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_4G_LIGHT" file="statusbar_network_4g_light.png" />
         <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ARCS_DARK" file="statusbar_network_arcs_dark.png" /> 
         <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ARCS_LIGHT" file="statusbar_network_arcs_light.png" />
         <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_BARS_DARK" file="statusbar_network_bars_dark.png" />
         <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_BARS_LIGHT" file="statusbar_network_bars_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_SECURE" file="statusbar_network_secure.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_EDGE_DARK" file="statusbar_network_edge_dark.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_EDGE_LIGHT" file="statusbar_network_edge_light.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ROAMING_DARK" file="statusbar_network_roaming_dark.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ROAMING_LIGHT" file="statusbar_network_roaming_light.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_SECURE_DARK" file="statusbar_network_secure_dark.png" />
+        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_SECURE_LIGHT" file="statusbar_network_secure_light.png" />
         <structure type="chrome_scaled_image" name="IDR_STATUSBAR_VPN" file="statusbar_vpn_dark.png" />
         <structure type="chrome_scaled_image" name="IDR_STATUSBAR_VPN_BADGE" file="statusbar_network_vpn_badge.png" />
         <structure type="chrome_scaled_image" name="IDR_STATUSBAR_WIRED" file="statusbar_wired.png" />
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index b676241e..4cf3187 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -734,7 +734,7 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) {
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_CELLULAR));
       gfx::ImageSkia icon;
       if (is_locked) {
-        icon = *rb.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_SECURE);
+        icon = *rb.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_SECURE_DARK);
       }
       int flag = FLAG_TOGGLE_MOBILE;
       if (cros->mobile_busy())
diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index fb355cd..9b8cd27 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -82,7 +82,8 @@ int CellularStrengthIndex(const CellularNetwork* cellular) {
 }
 
 const gfx::ImageSkia* BadgeForNetworkTechnology(
-    const CellularNetwork* cellular) {
+    const CellularNetwork* cellular,
+    NetworkMenuIcon::ResourceColorTheme color) {
   const int kUnknownBadgeType = -1;
   int id = kUnknownBadgeType;
   switch (cellular->network_technology()) {
@@ -94,7 +95,9 @@ const gfx::ImageSkia* BadgeForNetworkTechnology(
         case CellularNetwork::DATA_VERY_LOW:
         case CellularNetwork::DATA_LOW:
         case CellularNetwork::DATA_NORMAL:
-          id = IDR_STATUSBAR_NETWORK_3G;
+          id = (color == NetworkMenuIcon::COLOR_DARK) ?
+              IDR_STATUSBAR_NETWORK_3G_DARK :
+              IDR_STATUSBAR_NETWORK_3G_LIGHT;
           break;
         case CellularNetwork::DATA_UNKNOWN:
           id = IDR_STATUSBAR_NETWORK_3G_UNKNOWN;
@@ -123,10 +126,14 @@ const gfx::ImageSkia* BadgeForNetworkTechnology(
       id = IDR_STATUSBAR_NETWORK_GPRS;
       break;
     case NETWORK_TECHNOLOGY_EDGE:
-      id = IDR_STATUSBAR_NETWORK_EDGE;
+      id = (color == NetworkMenuIcon::COLOR_DARK) ?
+          IDR_STATUSBAR_NETWORK_EDGE_DARK :
+          IDR_STATUSBAR_NETWORK_EDGE_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_UMTS:
-      id = IDR_STATUSBAR_NETWORK_3G;
+      id =  (color == NetworkMenuIcon::COLOR_DARK) ?
+          IDR_STATUSBAR_NETWORK_3G_DARK :
+          IDR_STATUSBAR_NETWORK_3G_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_HSPA:
       id = IDR_STATUSBAR_NETWORK_HSPA;
@@ -489,6 +496,7 @@ class NetworkIcon {
     chromeos::NetworkLibrary* cros =
         chromeos::CrosLibrary::Get()->GetNetworkLibrary();
 
+    bool use_dark_icons = resource_color_theme_ == NetworkMenuIcon::COLOR_DARK;
     switch (network->type()) {
       case TYPE_ETHERNET: {
         if (network->disconnected()) {
@@ -500,14 +508,14 @@ class NetworkIcon {
       case TYPE_WIFI: {
         const WifiNetwork* wifi =
             static_cast<const WifiNetwork*>(network);
-        if (wifi->encrypted() &&
-            resource_color_theme_ == NetworkMenuIcon::COLOR_DARK)
+        if (wifi->encrypted() && use_dark_icons)
           bottom_right_badge_ = rb.GetImageSkiaNamed(
-              IDR_STATUSBAR_NETWORK_SECURE);
+              IDR_STATUSBAR_NETWORK_SECURE_DARK);
         break;
       }
       case TYPE_WIMAX: {
-        bottom_right_badge_ = rb.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_4G);
+        top_left_badge_ = rb.GetImageSkiaNamed(use_dark_icons ?
+             IDR_STATUSBAR_NETWORK_4G_DARK : IDR_STATUSBAR_NETWORK_4G_LIGHT);
         break;
       }
       case TYPE_CELLULAR: {
@@ -516,10 +524,13 @@ class NetworkIcon {
         if (cellular->roaming_state() == ROAMING_STATE_ROAMING &&
             !cros->IsCellularAlwaysInRoaming()) {
           // For cellular that always in roaming don't show roaming badge.
-          top_left_badge_ = rb.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_ROAMING);
+          bottom_right_badge_ = rb.GetImageSkiaNamed(use_dark_icons ?
+              IDR_STATUSBAR_NETWORK_ROAMING_DARK :
+              IDR_STATUSBAR_NETWORK_ROAMING_LIGHT);
         }
         if (!cellular->connecting())
-          bottom_right_badge_ = BadgeForNetworkTechnology(cellular);
+          top_left_badge_ = BadgeForNetworkTechnology(cellular,
+                                                      resource_color_theme_);
         break;
       }
       default:
@@ -631,8 +642,8 @@ class NetworkIcon {
     const CellularNetwork* cellular =
         static_cast<const CellularNetwork*>(network);
     const gfx::ImageSkia* technology_badge = BadgeForNetworkTechnology(
-        cellular);
-    if (technology_badge != bottom_right_badge_) {
+        cellular, resource_color_theme_);
+    if (technology_badge != top_left_badge_) {
       dirty = true;
     }
     if (cellular->roaming_state() != roaming_state_) {
diff --git a/chrome/browser/chromeos/status/network_menu_icon_unittest.cc b/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
index 88a76d2..18a82d9 100644
--- a/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
@@ -104,7 +104,8 @@ class NetworkMenuIconTest : public testing::Test {
     wifi_encrypted_50_image_ = NetworkMenuIcon::GenerateImageFromComponents(
         NetworkMenuIcon::GetImage(NetworkMenuIcon::ARCS, 3,
                                   NetworkMenuIcon::COLOR_DARK),
-        NULL, NULL, NULL, rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_SECURE));
+        NULL, NULL, NULL,
+        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_SECURE_DARK));
     // Wifi disconnected (strength = 0%) = ARCS0 icon.
     wifi_disconnected_image_ = NetworkMenuIcon::GenerateImageFromComponents(
         NetworkMenuIcon::GetImage(NetworkMenuIcon::ARCS, 0,
@@ -120,7 +121,7 @@ class NetworkMenuIconTest : public testing::Test {
             NetworkMenuIcon::GetImage(
                 NetworkMenuIcon::BARS, 3,
                 NetworkMenuIcon::COLOR_DARK),
-        NULL, NULL, NULL, rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_4G));
+        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_4G_DARK), NULL, NULL, NULL);
     // 3G connected, strength = 100% = BARS4 icon + 3G badge.
     cellular_connected_100_image_ =
         NetworkMenuIcon::GenerateImageFromComponents(
@@ -128,19 +129,20 @@ class NetworkMenuIconTest : public testing::Test {
                 NetworkMenuIcon::BARS,
                 NetworkMenuIcon::NumImages(NetworkMenuIcon::BARS) - 1,
                 NetworkMenuIcon::COLOR_DARK),
-        NULL, NULL, NULL, rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_3G));
+        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_3G_DARK), NULL, NULL, NULL);
     // 3G connected, strength = 50%, roaming = BARS2 icon + roaming & 3G badges.
     cellular_roaming_50_image_ = NetworkMenuIcon::GenerateImageFromComponents(
         NetworkMenuIcon::GetImage(NetworkMenuIcon::BARS, 3,
                                   NetworkMenuIcon::COLOR_DARK),
-        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_ROAMING), NULL,
-        NULL, rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_3G));
+        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_3G_DARK), NULL, NULL,
+        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_ROAMING_DARK));
     // 3G disconnected (strength = 0%) = BARS0 icon + 3G badge.
     cellular_disconnected_image_ =
         NetworkMenuIcon::GenerateImageFromComponents(
             NetworkMenuIcon::GetImage(NetworkMenuIcon::BARS, 0,
                                       NetworkMenuIcon::COLOR_DARK),
-            NULL, NULL, NULL, rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_3G));
+            rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_3G_DARK), NULL, NULL,
+            NULL);
     // 3G connecting = IDR_STATUSBAR_NETWORK_BARS1 (faded).
     cellular_connecting_image_ = NetworkMenuIcon::GenerateConnectingImage(
         NetworkMenuIcon::GetImage(NetworkMenuIcon::BARS, 1,