Ash: New assets for toolbar icons

chrome/app/theme/theme_resources_2x.grd

Index: chrome/app/theme/theme_resources_2x.grd
diff --git a/chrome/app/theme/theme_resources_2x.grd b/chrome/app/theme/theme_resources_2x.grd
index d76c3c2d4ea3ebe9acfccc10b9c5d6eec61a20fa..49bd18d8b182b655b7859a1292c71649616722b5 100644
--- a/chrome/app/theme/theme_resources_2x.grd
+++ b/chrome/app/theme/theme_resources_2x.grd
@@ -203,10 +203,18 @@
         <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left_2x.png" type="BINDATA" />
         <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right_2x.png" type="BINDATA" />
       </if>
-      <include name="IDR_TAB_CLOSE" file="tab_close_2x.png" type="BINDATA" />
-      <include name="IDR_TAB_CLOSE_H" file="tab_close_h_2x.png" type="BINDATA" />
-      <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask_2x.png" type="BINDATA" />
-      <include name="IDR_TAB_CLOSE_P" file="tab_close_p_2x.png" type="BINDATA" />
+      <if expr="pp_ifdef('use_ash')">
+        <include name="IDR_TAB_CLOSE" file="ash/tab_close_normal.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_H" file="ash/tab_close_hot.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_MASK" file="ash/tab_close_mask.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_P" file="ash/tab_close_pressed.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('use_ash')">
+        <include name="IDR_TAB_CLOSE" file="tab_close_2x.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_H" file="tab_close_h_2x.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask_2x.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_P" file="tab_close_p_2x.png" type="BINDATA" />
+      </if>
       <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down_2x.png" type="BINDATA" />
       <include name="IDR_TAB_DROP_UP" file="tab_drop_up_2x.png" type="BINDATA" />
       <if expr="pp_ifdef('use_ash')">
@@ -220,10 +228,10 @@
         <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right_2x.png" type="BINDATA" />
       </if>
       <if expr="pp_ifdef('use_ash')">
-        <include name="IDR_THEME_FRAME" file="ash/theme_frame.png" type="BINDATA" />
-        <include name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_frame_inactive.png" type="BINDATA" />
-        <include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognito.png" type="BINDATA" />
-        <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame_incognito_inactive.png" type="BINDATA" />
+        <include name="IDR_THEME_FRAME" file="ash/theme_default_active.png" type="BINDATA" />
+        <include name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_default_inactive.png" type="BINDATA" />
+        <include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_incognito_active.png" type="BINDATA" />
+        <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_incognito_inactive.png" type="BINDATA" />
       </if>
       <if expr="not pp_ifdef('use_ash')">
         <include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" />