Use Ash network icon resources instead of chrome icons

BUG=161869
TBR=sky@chromium.org


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

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

49 files changed, 52 insertions, 72 deletions

diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_1x.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_1x.png
deleted file mode 100644
index 5a25e1c..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_1x.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_1x_error.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_1x_error.png
deleted file mode 100644
index 4b6defe..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_1x_error.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_1x_unknown.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_1x_unknown.png
deleted file mode 100644
index 3d1b1a4..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_1x_unknown.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_dark.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_dark.png
deleted file mode 100644
index b623827..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_error.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_error.png
deleted file mode 100644
index 9894e7c..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_error.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_light.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_light.png
deleted file mode 100644
index b11a3db..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_unknown.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_unknown.png
deleted file mode 100644
index a57300b..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_3g_unknown.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_4g_dark.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_4g_dark.png
deleted file mode 100644
index e6d76fe..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_4g_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_4g_light.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_4g_light.png
deleted file mode 100644
index e4afeca..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_4g_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_arcs_dark.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_arcs_dark.png
deleted file mode 100644
index 72ccfe0..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_arcs_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_arcs_light.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_arcs_light.png
deleted file mode 100644
index 9e535c0..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_arcs_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_bars_dark.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_bars_dark.png
deleted file mode 100644
index a496af6..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_bars_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_bars_light.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_bars_light.png
deleted file mode 100644
index 7382e37..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_bars_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_edge_dark.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_edge_dark.png
deleted file mode 100644
index 3180a11..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_edge_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_edge_light.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_edge_light.png
deleted file mode 100644
index 4ece473..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_edge_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_gprs.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_gprs.png
deleted file mode 100644
index 4d13802..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_gprs.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_hspa.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_hspa.png
deleted file mode 100644
index 65b2c8c..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_hspa.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_hspa_plus.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_hspa_plus.png
deleted file mode 100644
index 7eab17a..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_hspa_plus.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_lte.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_lte.png
deleted file mode 100644
index f27cdc1..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_lte.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_lte_advanced.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_lte_advanced.png
deleted file mode 100644
index 2813bbc..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_lte_advanced.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_roaming_dark.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_roaming_dark.png
deleted file mode 100644
index 8623f5c..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_roaming_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_roaming_light.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_roaming_light.png
deleted file mode 100644
index fcd3088..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_roaming_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_secure_dark.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_secure_dark.png
deleted file mode 100644
index a7ad4be..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_secure_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_secure_light.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_secure_light.png
deleted file mode 100644
index ca140c3..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_secure_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_network_vpn_badge.png b/chrome/app/theme/default_100_percent/cros/statusbar_network_vpn_badge.png
deleted file mode 100644
index 6ce6e3f..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_network_vpn_badge.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_vpn_dark.png b/chrome/app/theme/default_100_percent/cros/statusbar_vpn_dark.png
deleted file mode 100644
index 9e03c17..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_vpn_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/cros/statusbar_wired.png b/chrome/app/theme/default_100_percent/cros/statusbar_wired.png
deleted file mode 100644
index d9f729f..0000000
--- a/chrome/app/theme/default_100_percent/cros/statusbar_wired.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_3g_dark.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_3g_dark.png
deleted file mode 100644
index 81c95e9..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_3g_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_3g_light.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_3g_light.png
deleted file mode 100644
index 5c9417b..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_3g_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_4g_dark.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_4g_dark.png
deleted file mode 100644
index ef5a767..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_4g_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_4g_light.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_4g_light.png
deleted file mode 100644
index 7a9c2a4..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_4g_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_arcs_dark.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_arcs_dark.png
deleted file mode 100644
index 4fd00e8..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_arcs_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_arcs_light.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_arcs_light.png
deleted file mode 100644
index 58455dc..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_arcs_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_bars_dark.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_bars_dark.png
deleted file mode 100644
index 8b1465c..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_bars_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_bars_light.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_bars_light.png
deleted file mode 100644
index 43e8e90..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_bars_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_edge_dark.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_edge_dark.png
deleted file mode 100644
index acd85b5..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_edge_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_edge_light.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_edge_light.png
deleted file mode 100644
index b565838..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_edge_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_roaming_dark.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_roaming_dark.png
deleted file mode 100644
index 3a58e67..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_roaming_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_roaming_light.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_roaming_light.png
deleted file mode 100644
index 5715c55..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_roaming_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_secure_dark.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_secure_dark.png
deleted file mode 100644
index 934ce16..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_secure_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_secure_light.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_secure_light.png
deleted file mode 100644
index bbf636f..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_secure_light.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_network_vpn_badge.png b/chrome/app/theme/default_200_percent/cros/statusbar_network_vpn_badge.png
deleted file mode 100644
index 9c88f8c..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_network_vpn_badge.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_vpn_dark.png b/chrome/app/theme/default_200_percent/cros/statusbar_vpn_dark.png
deleted file mode 100644
index dab7100..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_vpn_dark.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/cros/statusbar_wired.png b/chrome/app/theme/default_200_percent/cros/statusbar_wired.png
deleted file mode 100644
index 59cee00..0000000
--- a/chrome/app/theme/default_200_percent/cros/statusbar_wired.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 7dfcca7..734bd41 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -697,35 +697,6 @@
       <structure type="chrome_scaled_image" name="IDR_SHARE" file="share.png" />
       <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_1X" file="cros/statusbar_network_1x.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_1X_ERROR" file="cros/statusbar_network_1x_error.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_1X_UNKNOWN" file="cros/statusbar_network_1x_unknown.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_3G_DARK" file="cros/statusbar_network_3g_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_3G_ERROR" file="cros/statusbar_network_3g_error.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_3G_LIGHT" file="cros/statusbar_network_3g_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_3G_UNKNOWN" file="cros/statusbar_network_3g_unknown.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_4G_DARK" file="cros/statusbar_network_4g_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_4G_LIGHT" file="cros/statusbar_network_4g_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ARCS_DARK" file="cros/statusbar_network_arcs_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ARCS_LIGHT" file="cros/statusbar_network_arcs_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_BARS_DARK" file="cros/statusbar_network_bars_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_BARS_LIGHT" file="cros/statusbar_network_bars_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_EDGE_DARK" file="cros/statusbar_network_edge_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_EDGE_LIGHT" file="cros/statusbar_network_edge_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_GPRS" file="cros/statusbar_network_gprs.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_HSPA" file="cros/statusbar_network_hspa.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_HSPA_PLUS" file="cros/statusbar_network_hspa_plus.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_LTE" file="cros/statusbar_network_lte.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_LTE_ADVANCED" file="cros/statusbar_network_lte_advanced.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ROAMING_DARK" file="cros/statusbar_network_roaming_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ROAMING_LIGHT" file="cros/statusbar_network_roaming_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_SECURE_DARK" file="cros/statusbar_network_secure_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_SECURE_LIGHT" file="cros/statusbar_network_secure_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_VPN" file="cros/statusbar_vpn_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_VPN_BADGE" file="cros/statusbar_network_vpn_badge.png" />
-        <structure type="chrome_scaled_image" name="IDR_STATUSBAR_WIRED" file="cros/statusbar_wired.png" />
-      </if>
       <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
         <structure type="chrome_scaled_image" name="IDR_STOP" file="stop.png" />
         <structure type="chrome_scaled_image" name="IDR_STOP_D" file="stop_disabled.png" />
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 2abd5ac..4e7eda1 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -31,8 +31,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
+#include "grit/ash_resources.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
@@ -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_DARK);
+        icon = *rb.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_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 11f2a26..b26852c 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -12,8 +12,8 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "grit/ash_resources.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -87,32 +87,32 @@ const gfx::ImageSkia* BadgeForNetworkTechnology(
     case NETWORK_TECHNOLOGY_EVDO:
       switch (cellular->data_left()) {
         case CellularNetwork::DATA_NONE:
-          id = IDR_STATUSBAR_NETWORK_3G_ERROR;
+          id = IDR_AURA_UBER_TRAY_NETWORK_3G_ERROR;
           break;
         case CellularNetwork::DATA_VERY_LOW:
         case CellularNetwork::DATA_LOW:
         case CellularNetwork::DATA_NORMAL:
           id = (color == NetworkMenuIcon::COLOR_DARK) ?
-              IDR_STATUSBAR_NETWORK_3G_DARK :
-              IDR_STATUSBAR_NETWORK_3G_LIGHT;
+              IDR_AURA_UBER_TRAY_NETWORK_3G_DARK :
+              IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT;
           break;
         case CellularNetwork::DATA_UNKNOWN:
-          id = IDR_STATUSBAR_NETWORK_3G_UNKNOWN;
+          id = IDR_AURA_UBER_TRAY_NETWORK_3G_UNKNOWN;
           break;
       }
       break;
     case NETWORK_TECHNOLOGY_1XRTT:
       switch (cellular->data_left()) {
         case CellularNetwork::DATA_NONE:
-          id = IDR_STATUSBAR_NETWORK_1X_ERROR;
+          id = IDR_AURA_UBER_TRAY_NETWORK_1X_ERROR;
           break;
         case CellularNetwork::DATA_VERY_LOW:
         case CellularNetwork::DATA_LOW:
         case CellularNetwork::DATA_NORMAL:
-          id = IDR_STATUSBAR_NETWORK_1X;
+          id = IDR_AURA_UBER_TRAY_NETWORK_1X;
           break;
         case CellularNetwork::DATA_UNKNOWN:
-          id = IDR_STATUSBAR_NETWORK_1X_UNKNOWN;
+          id = IDR_AURA_UBER_TRAY_NETWORK_1X_UNKNOWN;
           break;
       }
       break;
@@ -120,32 +120,32 @@ const gfx::ImageSkia* BadgeForNetworkTechnology(
       // so there may not be a reason to create _ERROR or _UNKNOWN versions
       // of the following icons.
     case NETWORK_TECHNOLOGY_GPRS:
-      id = IDR_STATUSBAR_NETWORK_GPRS;
+      id = IDR_AURA_UBER_TRAY_NETWORK_GPRS;
       break;
     case NETWORK_TECHNOLOGY_EDGE:
       id = (color == NetworkMenuIcon::COLOR_DARK) ?
-          IDR_STATUSBAR_NETWORK_EDGE_DARK :
-          IDR_STATUSBAR_NETWORK_EDGE_LIGHT;
+          IDR_AURA_UBER_TRAY_NETWORK_EDGE_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_UMTS:
       id =  (color == NetworkMenuIcon::COLOR_DARK) ?
-          IDR_STATUSBAR_NETWORK_3G_DARK :
-          IDR_STATUSBAR_NETWORK_3G_LIGHT;
+          IDR_AURA_UBER_TRAY_NETWORK_3G_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT;
       break;
     case NETWORK_TECHNOLOGY_HSPA:
-      id = IDR_STATUSBAR_NETWORK_HSPA;
+      id = IDR_AURA_UBER_TRAY_NETWORK_HSPA;
       break;
     case NETWORK_TECHNOLOGY_HSPA_PLUS:
-      id = IDR_STATUSBAR_NETWORK_HSPA_PLUS;
+      id = IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS;
       break;
     case NETWORK_TECHNOLOGY_LTE:
-      id = IDR_STATUSBAR_NETWORK_LTE;
+      id = IDR_AURA_UBER_TRAY_NETWORK_LTE;
       break;
     case NETWORK_TECHNOLOGY_LTE_ADVANCED:
-      id = IDR_STATUSBAR_NETWORK_LTE_ADVANCED;
+      id = IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED;
       break;
     case NETWORK_TECHNOLOGY_GSM:
-      id = IDR_STATUSBAR_NETWORK_GPRS;
+      id = IDR_AURA_UBER_TRAY_NETWORK_GPRS;
       break;
     case NETWORK_TECHNOLOGY_UNKNOWN:
       break;
@@ -467,7 +467,7 @@ void NetworkIcon::SetIcon(const Network* network) {
 
   switch (type_) {
     case TYPE_ETHERNET: {
-      icon_ = *rb.GetImageSkiaNamed(IDR_STATUSBAR_WIRED);
+      icon_ = *rb.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_WIRED);
       break;
     }
     case TYPE_WIFI: {
@@ -496,12 +496,12 @@ void NetworkIcon::SetIcon(const Network* network) {
       break;
     }
     case TYPE_VPN: {
-      icon_ = *rb.GetImageSkiaNamed(IDR_STATUSBAR_VPN);
+      icon_ = *rb.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_VPN);
       break;
     }
     default: {
       LOG(WARNING) << "Request for icon for unsupported type: " << type_;
-      icon_ = *rb.GetImageSkiaNamed(IDR_STATUSBAR_WIRED);
+      icon_ = *rb.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_WIRED);
       break;
     }
   }
@@ -520,13 +520,15 @@ void NetworkIcon::SetBadges(const Network* network) {
       const WifiNetwork* wifi = static_cast<const WifiNetwork*>(network);
       if (wifi->encrypted() && use_dark_icons) {
         bottom_right_badge_ = rb.GetImageSkiaNamed(
-            IDR_STATUSBAR_NETWORK_SECURE_DARK);
+            IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK);
       }
       break;
     }
     case TYPE_WIMAX: {
-      top_left_badge_ = rb.GetImageSkiaNamed(use_dark_icons ?
-          IDR_STATUSBAR_NETWORK_4G_DARK : IDR_STATUSBAR_NETWORK_4G_LIGHT);
+      top_left_badge_ = rb.GetImageSkiaNamed(
+          use_dark_icons ?
+          IDR_AURA_UBER_TRAY_NETWORK_4G_DARK :
+          IDR_AURA_UBER_TRAY_NETWORK_4G_LIGHT);
       break;
     }
     case TYPE_CELLULAR: {
@@ -536,8 +538,8 @@ void NetworkIcon::SetBadges(const Network* network) {
           !cros->IsCellularAlwaysInRoaming()) {
         // For cellular that always in roaming don't show roaming badge.
         bottom_right_badge_ = rb.GetImageSkiaNamed(use_dark_icons ?
-            IDR_STATUSBAR_NETWORK_ROAMING_DARK :
-            IDR_STATUSBAR_NETWORK_ROAMING_LIGHT);
+            IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK :
+            IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT);
       }
       if (!cellular->connecting()) {
         top_left_badge_ = BadgeForNetworkTechnology(cellular,
@@ -548,8 +550,10 @@ void NetworkIcon::SetBadges(const Network* network) {
     default:
       break;
   }
-  if (vpn_connected_ && network->type() != TYPE_VPN)
-    bottom_left_badge_ = rb.GetImageSkiaNamed(IDR_STATUSBAR_VPN_BADGE);
+  if (vpn_connected_ && network->type() != TYPE_VPN) {
+    bottom_left_badge_ = rb.GetImageSkiaNamed(
+        IDR_AURA_UBER_TRAY_NETWORK_VPN_BADGE);
+  }
 }
 
 void NetworkIcon::UpdateIcon(const Network* network) {
@@ -809,7 +813,7 @@ void NetworkMenuIcon::SetActiveNetworkIconAndText(const Network* network) {
   if (network->type() != TYPE_VPN &&
       cros->virtual_network() && cros->virtual_network()->connecting()) {
     const gfx::ImageSkia* vpn_badge =
-        rb.GetImageSkiaNamed(IDR_STATUSBAR_VPN_BADGE);
+        rb.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_VPN_BADGE);
     const double animation = GetAnimation();
     animating = true;
     // Even though this is the only place we use vpn_connecting_badge_,
@@ -922,7 +926,8 @@ const gfx::ImageSkia NetworkMenuIcon::GetImage(ImageType type,
       return gfx::ImageSkia();
     images = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         color == NetworkMenuIcon::COLOR_DARK ?
-        IDR_STATUSBAR_NETWORK_ARCS_DARK : IDR_STATUSBAR_NETWORK_ARCS_LIGHT);
+        IDR_AURA_UBER_TRAY_NETWORK_ARCS_DARK :
+        IDR_AURA_UBER_TRAY_NETWORK_ARCS_LIGHT);
     width = images->width();
     height = images->height() / kNumArcsImages;
   } else {
@@ -931,7 +936,8 @@ const gfx::ImageSkia NetworkMenuIcon::GetImage(ImageType type,
 
     images = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         color == NetworkMenuIcon::COLOR_DARK ?
-        IDR_STATUSBAR_NETWORK_BARS_DARK : IDR_STATUSBAR_NETWORK_BARS_LIGHT);
+        IDR_AURA_UBER_TRAY_NETWORK_BARS_DARK :
+        IDR_AURA_UBER_TRAY_NETWORK_BARS_LIGHT);
     width = images->width();
     height = images->height() / kNumBarsImages;
   }
@@ -952,7 +958,7 @@ const gfx::ImageSkia NetworkMenuIcon::GetConnectedImage(ImageType type,
 
 gfx::ImageSkia* NetworkMenuIcon::GetVirtualNetworkImage() {
   return ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      IDR_STATUSBAR_VPN);
+      IDR_AURA_UBER_TRAY_NETWORK_VPN);
 }
 
 int NetworkMenuIcon::NumImages(ImageType type) {
diff --git a/chrome/browser/chromeos/status/network_menu_icon_unittest.cc b/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
index b17a0f5..3df0ea0 100644
--- a/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "grit/theme_resources.h"
+#include "grit/ash_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -84,7 +84,7 @@ class NetworkMenuIconTest : public testing::Test {
     cros_ = CrosLibrary::Get()->GetNetworkLibrary();
     // Ethernet connected = WIRED icon, no badges.
     ethernet_connected_image_ = NetworkMenuIcon::GenerateImageFromComponents(
-        *rb_.GetImageSkiaNamed(IDR_STATUSBAR_WIRED),
+        *rb_.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_WIRED),
         NULL, NULL, NULL, NULL);
     // Wifi connected, strength = 100% = ARCS4 icon, no badges.
     wifi_connected_100_image_ = NetworkMenuIcon::GenerateImageFromComponents(
@@ -98,8 +98,8 @@ class NetworkMenuIconTest : public testing::Test {
         NetworkMenuIcon::GetImage(NetworkMenuIcon::ARCS, 3,
                                   NetworkMenuIcon::COLOR_DARK),
         NULL, NULL, NULL,
-        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_SECURE_DARK));
-    // Wifi connecting = IDR_STATUSBAR_NETWORK_ARCS1 (faded).
+        rb_.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK));
+    // Wifi connecting = IDR_AURA_UBER_TRAY_NETWORK_ARCS1 (faded).
     wifi_connecting_image_ = NetworkMenuIcon::GenerateConnectingImage(
         NetworkMenuIcon::GetImage(NetworkMenuIcon::ARCS, 1,
                                   NetworkMenuIcon::COLOR_DARK));
@@ -109,7 +109,8 @@ class NetworkMenuIconTest : public testing::Test {
             NetworkMenuIcon::GetImage(
                 NetworkMenuIcon::BARS, 3,
                 NetworkMenuIcon::COLOR_DARK),
-        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_4G_DARK), NULL, NULL, NULL);
+            rb_.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_4G_DARK),
+            NULL, NULL, NULL);
     // 3G connected, strength = 100% = BARS4 icon + 3G badge.
     cellular_connected_100_image_ =
         NetworkMenuIcon::GenerateImageFromComponents(
@@ -117,14 +118,15 @@ class NetworkMenuIconTest : public testing::Test {
                 NetworkMenuIcon::BARS,
                 NetworkMenuIcon::NumImages(NetworkMenuIcon::BARS) - 1,
                 NetworkMenuIcon::COLOR_DARK),
-        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_3G_DARK), NULL, NULL, NULL);
+            rb_.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_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_3G_DARK), NULL, NULL,
-        rb_.GetImageSkiaNamed(IDR_STATUSBAR_NETWORK_ROAMING_DARK));
-    // 3G connecting = IDR_STATUSBAR_NETWORK_BARS1 (faded).
+        rb_.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_3G_DARK), NULL, NULL,
+        rb_.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK));
+    // 3G connecting = IDR_AURA_UBER_TRAY_NETWORK_BARS1 (faded).
     cellular_connecting_image_ = NetworkMenuIcon::GenerateConnectingImage(
         NetworkMenuIcon::GetImage(NetworkMenuIcon::BARS, 1,
                                   NetworkMenuIcon::COLOR_DARK));
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index a76dafc..ce4a52b 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -712,6 +712,7 @@
         ['use_ash==1', {
           'dependencies': [
             '../ash/ash.gyp:ash',
+            '../ash/ash.gyp:ash_resources',
             '../ash/ash_strings.gyp:ash_strings',
             '../ui/app_list/app_list.gyp:app_list',
             '../ui/message_center/message_center.gyp:message_center',