Move remaining images from ui/resources to default_100_percent and use correct scale in css files

BUG=129203
TEST=Build

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

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

13 files changed, 17 insertions, 17 deletions

diff --git a/ui/resources/close_bar.png b/ui/resources/close_bar.png
deleted file mode 100644
index 912df05d..0000000
--- a/ui/resources/close_bar.png
+++ /dev/null
diff --git a/ui/resources/close_bar_h.png b/ui/resources/close_bar_h.png
deleted file mode 100644
index c5e1481..0000000
--- a/ui/resources/close_bar_h.png
+++ /dev/null
diff --git a/ui/resources/close_bar_mask.png b/ui/resources/close_bar_mask.png
deleted file mode 100644
index 0b604ee..0000000
--- a/ui/resources/close_bar_mask.png
+++ /dev/null
diff --git a/ui/resources/close_bar_p.png b/ui/resources/close_bar_p.png
deleted file mode 100644
index cc5bbbe..0000000
--- a/ui/resources/close_bar_p.png
+++ /dev/null
diff --git a/ui/resources/folder_closed.png b/ui/resources/folder_closed.png
deleted file mode 100644
index 746fab9..0000000
--- a/ui/resources/folder_closed.png
+++ /dev/null
diff --git a/ui/resources/folder_closed_rtl.png b/ui/resources/folder_closed_rtl.png
deleted file mode 100644
index 3d4c37f..0000000
--- a/ui/resources/folder_closed_rtl.png
+++ /dev/null
diff --git a/ui/resources/folder_open.png b/ui/resources/folder_open.png
deleted file mode 100644
index 3276810..0000000
--- a/ui/resources/folder_open.png
+++ /dev/null
diff --git a/ui/resources/folder_open_rtl.png b/ui/resources/folder_open_rtl.png
deleted file mode 100644
index 9ba7069..0000000
--- a/ui/resources/folder_open_rtl.png
+++ /dev/null
diff --git a/ui/resources/oak.png b/ui/resources/oak.png
deleted file mode 100644
index a439e4c..0000000
--- a/ui/resources/oak.png
+++ /dev/null
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 2153456..6d3ccce 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -31,10 +31,10 @@
       <include name="IDR_CONTENT_RIGHT_SIDE" file="default_100_percent/content_right_side.png" type="BINDATA" />
       <include name="IDR_DEFAULT_FAVICON" file="default_100_percent/default_favicon.png" type="BINDATA" />
       <include name="IDR_DEFAULT_LARGE_FAVICON" file="default_100_percent/default_large_favicon.png" type="BINDATA" />
-      <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" />
-      <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" />
-      <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" />
-      <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" />
+      <include name="IDR_FOLDER_CLOSED" file="default_100_percent/folder_closed.png" type="BINDATA" />
+      <include name="IDR_FOLDER_CLOSED_RTL" file="default_100_percent/folder_closed_rtl.png" type="BINDATA" />
+      <include name="IDR_FOLDER_OPEN" file="default_100_percent/folder_open.png" type="BINDATA" />
+      <include name="IDR_FOLDER_OPEN_RTL" file="default_100_percent/folder_open_rtl.png" type="BINDATA" />
       <include name="IDR_FRAME" file="default_100_percent/frame_default.png" type="BINDATA" />
       <include name="IDR_FRAME_APP_PANEL" file="default_100_percent/frame_app_panel_default.png" type="BINDATA" />
       <include name="IDR_FRAME_INACTIVE" file="default_100_percent/frame_default_inactive.png" type="BINDATA" />
@@ -284,7 +284,7 @@
         <include name="IDR_AURA_WINDOW_ZOOM_ICON" file="default_100_percent/aura/slab_zoom.png" type="BINDATA" />
 
         <include name="IDR_AURA_SWITCH_MONITOR" file="default_100_percent/ash/switch_monitor.png" type="BINDATA" />
-        <include name="IDR_OAK" file="oak.png" type="BINDATA"/>
+        <include name="IDR_OAK" file="default_100_percent/oak.png" type="BINDATA"/>
       </if>
     </includes>
   </release>
diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd
index e6a0bdf..2b964d4 100644
--- a/ui/resources/ui_resources_standard.grd
+++ b/ui/resources/ui_resources_standard.grd
@@ -40,10 +40,10 @@
       <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" />
 
-      <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR" file="default_100_percent/close_bar.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_H" file="default_100_percent/close_bar_hover.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_MASK" file="default_100_percent/close_bar_mask.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_P" file="default_100_percent/close_bar_pressed.png" type="BINDATA" />
       <include name="IDR_THROBBER" file="default_100_percent/throbber.png" type="BINDATA" />
 
       <!-- Remaining images only used by Aura. -->
diff --git a/ui/resources/ui_resources_touch.grd b/ui/resources/ui_resources_touch.grd
index fd7aa98..e81c6db 100644
--- a/ui/resources/ui_resources_touch.grd
+++ b/ui/resources/ui_resources_touch.grd
@@ -37,10 +37,10 @@
       <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" />
 
-      <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR" file="default_100_percent/close_bar.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_H" file="default_100_percent/close_bar_hover.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_MASK" file="default_100_percent/close_bar_mask.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_P" file="default_100_percent/close_bar_pressed.png" type="BINDATA" />
       <include name="IDR_THROBBER" file="default_100_percent/throbber.png" type="BINDATA" />
 
       <!-- Remaining images only used by Aura. -->
diff --git a/ui/resources/ui_resources_touch_2x.grd b/ui/resources/ui_resources_touch_2x.grd
index c589819..e340daa 100644
--- a/ui/resources/ui_resources_touch_2x.grd
+++ b/ui/resources/ui_resources_touch_2x.grd
@@ -37,10 +37,10 @@
       <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" />
 
-      <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR" file="default_200_percent/close_bar.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_H" file="default_200_percent/close_bar_hover.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_MASK" file="default_200_percent/close_bar_mask.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_P" file="default_200_percent/close_bar_pressed.png" type="BINDATA" />
       <include name="IDR_THROBBER" file="default_200_percent/throbber.png" type="BINDATA" />
 
       <!-- Remaining images only used by Aura. -->