diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 16:00:27 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 16:00:27 +0000 |
| commit | 797961dd630b499647da36d5a222b7f10c6c8684 (patch) | |
| tree | e80f47b799fcd04013b107ca10e3e1ae7a98b3ed /chrome/app/theme/theme_resources_2x.grd | |
| parent | fa202f3e3b62ba2cefa3e79ec6209072bccdc1f1 (diff) | |
| download | chromium_src-797961dd630b499647da36d5a222b7f10c6c8684.zip chromium_src-797961dd630b499647da36d5a222b7f10c6c8684.tar.gz chromium_src-797961dd630b499647da36d5a222b7f10c6c8684.tar.bz2 | |
Ash: New assets for toolbar icons
* Added special Ash version of tab close button, currently the same as non-Ash but more art will follow.
* Made theme frame filenames more consistent.
Part 1 of many patches coming for Ash toolbar updates.
BUG=115234
TEST=visual
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10217014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme/theme_resources_2x.grd')
| -rw-r--r-- | chrome/app/theme/theme_resources_2x.grd | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/chrome/app/theme/theme_resources_2x.grd b/chrome/app/theme/theme_resources_2x.grd index d76c3c2d..49bd18d 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" /> |