diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 20:32:45 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 20:32:45 +0000 |
| commit | b8e303f516c8202d49b31b2ea0405fcd4676698c (patch) | |
| tree | 365926cf21012bb073ac13ddda17de54b89df21f /ui | |
| parent | 110a9e6adf8c3e7fff37bb0ebd8db5429728a11c (diff) | |
| download | chromium_src-b8e303f516c8202d49b31b2ea0405fcd4676698c.zip chromium_src-b8e303f516c8202d49b31b2ea0405fcd4676698c.tar.gz chromium_src-b8e303f516c8202d49b31b2ea0405fcd4676698c.tar.bz2 | |
Ash: Use new textbutton images
This makes the bookmarks bar match the style of the back/forward/reload buttons. Also tweak the toolbar bottom-line color at Andre's request.
BUG=119813
TEST=visual
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/9837077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/resources/ui_resources.grd | 59 |
1 files changed, 41 insertions, 18 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index a32e533..43d2e42 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -70,24 +70,47 @@ <include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" /> <include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" /> </if> - <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" /> + <if expr="pp_ifdef('use_aura')"> + <!-- TODO(jamescook): Rename the IDR constants to put hot/pressed state before position. --> + <include name="IDR_TEXTBUTTON_BOTTOM_H" file="aura/textbutton_hot_bottom.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="aura/textbutton_hot_bottom_left.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="aura/textbutton_pressed_bottom_left.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_P" file="aura/textbutton_pressed_bottom.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="aura/textbutton_hot_bottom_right.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="aura/textbutton_pressed_bottom_right.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_H" file="aura/textbutton_hot_center.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_P" file="aura/textbutton_pressed_center.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_H" file="aura/textbutton_hot_left.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_P" file="aura/textbutton_pressed_left.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_H" file="aura/textbutton_hot_right.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_P" file="aura/textbutton_pressed_right.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_H" file="aura/textbutton_hot_top.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="aura/textbutton_hot_top_left.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="aura/textbutton_pressed_top_left.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_P" file="aura/textbutton_pressed_top.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="aura/textbutton_hot_top_right.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="aura/textbutton_pressed_top_right.png" type="BINDATA" /> + </if> + <if expr="not pp_ifdef('use_aura')"> + <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" /> + </if> <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" /> <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" /> <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" /> |