Cleanup theme resources: no more ash directory

chrome/app/theme/theme_resources.grd

Index: chrome/app/theme/theme_resources.grd
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 37125d3832124b6aedfc99c2e22311d2a7dabb4f..3d8cbc5363130800b068c57a93852cfd7a292734 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -130,7 +130,7 @@
         <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" />
       </if>
       <if expr="pp_ifdef('use_ash')">
-        <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" />
+        <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="cros/content_top_center.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" />
       <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" />
@@ -462,8 +462,8 @@
         <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="common/newtab_normal.png" />
         <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="common/newtab_button_mask.png" />
         <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="common/newtab_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_PLUS" file="ash/newtab_plus.png" />
-        <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P_PLUS" file="ash/newtab_plus_pressed.png" />
+        <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_PLUS" file="common/newtab_plus.png" />
+        <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P_PLUS" file="common/newtab_plus_pressed.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_NEWTAB_CHROMEOS_WELCOME_PAGE_THUMBNAIL" file="ntp_welcome_thumb_chromeos.png" />
       <structure type="chrome_scaled_image" name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="ntp_welcome_thumb.png" />
@@ -823,7 +823,7 @@
         <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_LEFT" file="common/toolbar_shade_left.png" />
         <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_RIGHT" file="common/toolbar_shade_right.png" />
         <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file="common/toolbar_shade_top.png" />
-        <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP_SEARCH" file="ash/toolbar_shade_top_search.png" />
+        <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP_SEARCH" file="cros/toolbar_shade_top_search.png" />

[benrg, 2012/09/14 17:39:03]

I assume you know what you're doing but I don't understand why this image
belongs in cros/ and the other toolbar_shade_*.png images in common/, when
they're all guarded by #ifdef use_ash.

[oshima, 2012/09/14 17:49:33]

This can be common, but I need to check with UX team what's the plan because
it's not clear why this was in ash in the first place.
(if there will be different common/toolbar_shade_top_search.png, this needs to
be in cros)

For now, i think it's safe to simply move ash -> cros, and this can be fixed by
follow up cleanups.

       </if>
       <if expr="not pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_TOOLS" file="tools.png" />