ash: Some new assets for the uber-tray.

BUG=119832
TEST=manually
TBR=sky@chromium.org

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

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

9 files changed, 10 insertions, 6 deletions

diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index fda568b..104174c 100644
--- a/ash/system/tray_accessibility.cc
+++ b/ash/system/tray_accessibility.cc
@@ -31,7 +31,7 @@ class DefaultAccessibilityView : public ActionableView {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     FixedSizedImageView* image =
         new FixedSizedImageView(0, kTrayPopupItemHeight);
-    image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY).
+    image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK).
                     ToImageSkia());
 
     AddChildView(image);
@@ -91,7 +91,7 @@ views::View* TrayAccessibility::CreateDetailedView(user::LoginStatus status) {
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::ImageView* image = new views::ImageView;
-  image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY).
+  image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK).
       ToImageSkia());
 
   detailed_->AddChildView(image);
diff --git a/ui/resources/default_100_percent/ash/status_accessibility_dark.png b/ui/resources/default_100_percent/ash/status_accessibility_dark.png
new file mode 100644
index 0000000..f1a8332
--- /dev/null
+++ b/ui/resources/default_100_percent/ash/status_accessibility_dark.png
diff --git a/ui/resources/default_200_percent/ash/status_accessibility_dark.png b/ui/resources/default_200_percent/ash/status_accessibility_dark.png
new file mode 100644
index 0000000..44da10e
--- /dev/null
+++ b/ui/resources/default_200_percent/ash/status_accessibility_dark.png
diff --git a/ui/resources/default_200_percent/ash/status_ime.png b/ui/resources/default_200_percent/ash/status_ime.png
new file mode 100644
index 0000000..c0cd87b
--- /dev/null
+++ b/ui/resources/default_200_percent/ash/status_ime.png
diff --git a/ui/resources/default_200_percent/ash/status_more.png b/ui/resources/default_200_percent/ash/status_more.png
new file mode 100644
index 0000000..8d96dec
--- /dev/null
+++ b/ui/resources/default_200_percent/ash/status_more.png
diff --git a/ui/resources/ui_resources_2x.grd b/ui/resources/ui_resources_2x.grd
index 5f2993f..3508aeee 100644
--- a/ui/resources/ui_resources_2x.grd
+++ b/ui/resources/ui_resources_2x.grd
@@ -123,9 +123,10 @@
         <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/ash/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_200_percent/ash/status_more.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/ash/status_less.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="default_200_percent/ash/status_accessibility_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_200_percent/ash/status_capslock.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_200_percent/ash/status_capslock_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_200_percent/ash/status_bluetooth.png" type="BINDATA" />
@@ -135,7 +136,7 @@
         <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/ash/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_200_percent/ash/status_ime.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_200_percent/ash/status_update.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_200_percent/ash/status_update_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_200_percent/ash/status_wifi_enabled.png" type="BINDATA" />
diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd
index 99143a9..e6a0bdf 100644
--- a/ui/resources/ui_resources_standard.grd
+++ b/ui/resources/ui_resources_standard.grd
@@ -126,6 +126,7 @@
         <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/ash/status_more.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/ash/status_less.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="default_100_percent/ash/status_accessibility_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/ash/status_capslock.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/ash/status_capslock_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/ash/status_bluetooth.png" type="BINDATA" />
diff --git a/ui/resources/ui_resources_touch.grd b/ui/resources/ui_resources_touch.grd
index 59e99b3..bc01d10 100644
--- a/ui/resources/ui_resources_touch.grd
+++ b/ui/resources/ui_resources_touch.grd
@@ -123,6 +123,7 @@
         <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/ash/status_more.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/ash/status_less.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="default_100_percent/ash/status_accessibility_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/ash/status_capslock.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/ash/status_capslock_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/ash/status_bluetooth.png" type="BINDATA" />
diff --git a/ui/resources/ui_resources_touch_2x.grd b/ui/resources/ui_resources_touch_2x.grd
index f0efaa7..4324beb 100644
--- a/ui/resources/ui_resources_touch_2x.grd
+++ b/ui/resources/ui_resources_touch_2x.grd
@@ -120,9 +120,10 @@
         <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/ash/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_200_percent/ash/status_more.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/ash/status_less.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="default_200_percent/ash/status_accessibility_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_200_percent/ash/status_capslock.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_200_percent/ash/status_capslock_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_200_percent/ash/status_bluetooth.png" type="BINDATA" />
@@ -132,7 +133,7 @@
         <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/ash/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_200_percent/ash/status_ime.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_200_percent/ash/status_update.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_200_percent/ash/status_update_dark.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_200_percent/ash/status_wifi_enabled.png" type="BINDATA" />