Makes non ash use Ash text button resources

BUG=137365
Test=Text buttons look ok on Mac

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

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

19 files changed, 18 insertions, 38 deletions

diff --git a/ui/resources/default_100_percent/textbutton_b_hover.png b/ui/resources/default_100_percent/textbutton_b_hover.png
deleted file mode 100644
index ddf6a5b..0000000
--- a/ui/resources/default_100_percent/textbutton_b_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_b_pressed.png b/ui/resources/default_100_percent/textbutton_b_pressed.png
deleted file mode 100644
index 74e9d12..0000000
--- a/ui/resources/default_100_percent/textbutton_b_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_bl_hover.png b/ui/resources/default_100_percent/textbutton_bl_hover.png
deleted file mode 100644
index 38d14d5..0000000
--- a/ui/resources/default_100_percent/textbutton_bl_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_bl_pressed.png b/ui/resources/default_100_percent/textbutton_bl_pressed.png
deleted file mode 100644
index 2b45638..0000000
--- a/ui/resources/default_100_percent/textbutton_bl_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_br_hover.png b/ui/resources/default_100_percent/textbutton_br_hover.png
deleted file mode 100644
index 84cbc3d..0000000
--- a/ui/resources/default_100_percent/textbutton_br_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_br_pressed.png b/ui/resources/default_100_percent/textbutton_br_pressed.png
deleted file mode 100644
index 3134f33..0000000
--- a/ui/resources/default_100_percent/textbutton_br_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_c_hover.png b/ui/resources/default_100_percent/textbutton_c_hover.png
deleted file mode 100644
index eedf89c0..0000000
--- a/ui/resources/default_100_percent/textbutton_c_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_c_pressed.png b/ui/resources/default_100_percent/textbutton_c_pressed.png
deleted file mode 100644
index e12af39..0000000
--- a/ui/resources/default_100_percent/textbutton_c_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_l_hover.png b/ui/resources/default_100_percent/textbutton_l_hover.png
deleted file mode 100644
index fdfd3cc..0000000
--- a/ui/resources/default_100_percent/textbutton_l_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_l_pressed.png b/ui/resources/default_100_percent/textbutton_l_pressed.png
deleted file mode 100644
index 9e422a1..0000000
--- a/ui/resources/default_100_percent/textbutton_l_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_r_hover.png b/ui/resources/default_100_percent/textbutton_r_hover.png
deleted file mode 100644
index a275cee..0000000
--- a/ui/resources/default_100_percent/textbutton_r_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_r_pressed.png b/ui/resources/default_100_percent/textbutton_r_pressed.png
deleted file mode 100644
index 21139b4..0000000
--- a/ui/resources/default_100_percent/textbutton_r_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_t_hover.png b/ui/resources/default_100_percent/textbutton_t_hover.png
deleted file mode 100644
index 68e6b92..0000000
--- a/ui/resources/default_100_percent/textbutton_t_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_t_pressed.png b/ui/resources/default_100_percent/textbutton_t_pressed.png
deleted file mode 100644
index 7511999..0000000
--- a/ui/resources/default_100_percent/textbutton_t_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_tl_hover.png b/ui/resources/default_100_percent/textbutton_tl_hover.png
deleted file mode 100644
index c06ad0f..0000000
--- a/ui/resources/default_100_percent/textbutton_tl_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_tl_pressed.png b/ui/resources/default_100_percent/textbutton_tl_pressed.png
deleted file mode 100644
index dcf5cb1..0000000
--- a/ui/resources/default_100_percent/textbutton_tl_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_tr_hover.png b/ui/resources/default_100_percent/textbutton_tr_hover.png
deleted file mode 100644
index 5e27d37..0000000
--- a/ui/resources/default_100_percent/textbutton_tr_hover.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/textbutton_tr_pressed.png b/ui/resources/default_100_percent/textbutton_tr_pressed.png
deleted file mode 100644
index 9f215c2..0000000
--- a/ui/resources/default_100_percent/textbutton_tr_pressed.png
+++ /dev/null
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index ea58c9e..840799d 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -412,45 +412,25 @@
         <structure type="chrome_scaled_image" name="IDR_RESTORE" file="restore.png" />
         <structure type="chrome_scaled_image" name="IDR_RESTORE_H" file="restore_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_RESTORE_P" file="restore_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM" file="common/textbutton_hover_bottom.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT" file="common/textbutton_hover_bottom_left.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT" file="common/textbutton_hover_bottom_right.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_CENTER" file="common/textbutton_hover_center.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_LEFT" file="common/textbutton_hover_left.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_RIGHT" file="common/textbutton_hover_right.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP" file="common/textbutton_hover_top.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP_LEFT" file="common/textbutton_hover_top_left.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP_RIGHT" file="common/textbutton_hover_top_right.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM" file="common/textbutton_pressed_bottom.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT" file="common/textbutton_pressed_bottom_left.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT" file="common/textbutton_pressed_bottom_right.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_CENTER" file="common/textbutton_pressed_center.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_LEFT" file="common/textbutton_pressed_left.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_RIGHT" file="common/textbutton_pressed_right.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP" file="common/textbutton_pressed_top.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_LEFT" file="common/textbutton_pressed_top_left.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_RIGHT" file="common/textbutton_pressed_top_right.png" />
-      </if>
-      <if expr="not pp_ifdef('toolkit_views')">
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM" file="textbutton_b_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT" file="textbutton_bl_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT" file="textbutton_br_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_CENTER" file="textbutton_c_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_LEFT" file="textbutton_l_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_RIGHT" file="textbutton_r_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP" file="textbutton_t_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP_LEFT" file="textbutton_tl_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP_RIGHT" file="textbutton_tr_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM" file="textbutton_b_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT" file="textbutton_bl_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT" file="textbutton_br_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_CENTER" file="textbutton_c_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_LEFT" file="textbutton_l_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_RIGHT" file="textbutton_r_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP" file="textbutton_t_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_LEFT" file="textbutton_tl_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_RIGHT" file="textbutton_tr_pressed.png" />
       </if>
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM" file="common/textbutton_hover_bottom.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT" file="common/textbutton_hover_bottom_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT" file="common/textbutton_hover_bottom_right.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_CENTER" file="common/textbutton_hover_center.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_LEFT" file="common/textbutton_hover_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_RIGHT" file="common/textbutton_hover_right.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP" file="common/textbutton_hover_top.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP_LEFT" file="common/textbutton_hover_top_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_TOP_RIGHT" file="common/textbutton_hover_top_right.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM" file="common/textbutton_pressed_bottom.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT" file="common/textbutton_pressed_bottom_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT" file="common/textbutton_pressed_bottom_right.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_CENTER" file="common/textbutton_pressed_center.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_LEFT" file="common/textbutton_pressed_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_RIGHT" file="common/textbutton_pressed_right.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP" file="common/textbutton_pressed_top.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_LEFT" file="common/textbutton_pressed_top_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_RIGHT" file="common/textbutton_pressed_top_right.png" />
       <structure type="chrome_scaled_image" name="IDR_THROBBER" file="throbber.png" />
       <structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" />
       <structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" />