diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 03:51:04 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 03:51:04 +0000 |
| commit | e2d54c0632fb72045d466f7324af28a61ddb58bf (patch) | |
| tree | 982891648bc42a9d94b750864bd4c04be68cde37 /chrome/app/theme/theme_resources_2x.grd | |
| parent | e25ddcedf6a27f44dc994109109d0c390de95ccd (diff) | |
| download | chromium_src-e2d54c0632fb72045d466f7324af28a61ddb58bf.zip chromium_src-e2d54c0632fb72045d466f7324af28a61ddb58bf.tar.gz chromium_src-e2d54c0632fb72045d466f7324af28a61ddb58bf.tar.bz2 | |
Ash: Cleanup aura/ash/chromeos theme resources
* Delete unused assets
* Rename theme_frame_default_* to theme_frame_*
BUG=118926
TEST=built and visually checked linux_chromeos, linux, windows
Review URL: https://chromiumcodereview.appspot.com/9729014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127637 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 | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/chrome/app/theme/theme_resources_2x.grd b/chrome/app/theme/theme_resources_2x.grd index 336812e..a983dac 100644 --- a/chrome/app/theme/theme_resources_2x.grd +++ b/chrome/app/theme/theme_resources_2x.grd @@ -191,36 +191,27 @@ <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left_2x.png" type="BINDATA" /> <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right_2x.png" type="BINDATA" /> <if expr="pp_ifdef('use_ash')"> - <include name="IDR_THEME_FRAME" file="theme_frame_default_aura.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive_aura.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito_aura.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_aura.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_ash')"> - <include name="IDR_THEME_FRAME" file="theme_frame_default2_2x.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default2_2x.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default2_incognito_2x.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default2_incognito_2x.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_ash')"> - <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive.png" type="BINDATA" /> + <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" /> </if> - <if expr="pp_ifdef('use_ash')"> - <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background_aura.png" type="BINDATA" /> + <if expr="not pp_ifdef('use_ash')"> + <include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_inactive.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_incognito_inactive.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_ash')"> - <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2_2x.png" type="BINDATA" /> + <if expr="pp_ifdef('use_ash')"> + <include name="IDR_THEME_TAB_BACKGROUND" file="ash/theme_tab_background.png" type="BINDATA" /> </if> - <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('use_ash')"> <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('chromeos') or is_macosx"> + <if expr="pp_ifdef('use_ash') or is_macosx"> <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2_2x.png" type="BINDATA" /> </if> - <if expr="not pp_ifdef('chromeos') and not is_macosx"> + <if expr="not pp_ifdef('use_ash') and not is_macosx"> <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" /> </if> <if expr="is_macosx"> |