diff options
| author | lambroslambrou@google.com <lambroslambrou@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 22:13:11 +0000 |
|---|---|---|
| committer | lambroslambrou@google.com <lambroslambrou@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 22:13:11 +0000 |
| commit | 53c808a30fe47b754a12dc5f3ea1a6fdb97455b7 (patch) | |
| tree | 857c53e0bbc28ad73244f8ce844f917b053821ac /ui | |
| parent | 0b74c338bd286e51a004981e746cc212c2d5423c (diff) | |
| download | chromium_src-53c808a30fe47b754a12dc5f3ea1a6fdb97455b7.zip chromium_src-53c808a30fe47b754a12dc5f3ea1a6fdb97455b7.tar.gz chromium_src-53c808a30fe47b754a12dc5f3ea1a6fdb97455b7.tar.bz2 | |
Revert 149915 - Use low resolution wallpapers for small screens
Broke Win Aura compile
BUG=140336
TBR=jhawkins
Review URL: https://chromiumcodereview.appspot.com/10837089
TBR=bshe@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10829178
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/resources/ui_resources.grd | 87 |
1 files changed, 29 insertions, 58 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index d94da3f..41db982 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -470,100 +470,71 @@ <includes> <!-- Wallpapers used by Ash when building ChromiumOS. --> <if expr="pp_ifdef('use_ash') and not pp_ifdef('_google_chrome')"> - <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_LARGE" file="aura/wallpapers/large/romainguy_0.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_SMALL" file="aura/wallpapers/small/romainguy_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0" file="aura/wallpapers/romainguy_0.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_THUMB" file="aura/wallpapers/romainguy_0_thumb.jpg" type="BINDATA" /> </if> <!-- Wallpapers available to Ash when building Official ChromeOS. --> <if expr="pp_ifdef('use_ash') and pp_ifdef('_google_chrome')"> - <include name="IDR_AURA_WALLPAPERS_1_NATURE0_LARGE" file="aura/google_wallpapers/large/1-nature0.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE0_SMALL" file="aura/google_wallpapers/small/1-nature0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_1_NATURE0" file="aura/google_wallpapers/1-nature0.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_1_NATURE0_THUMB" file="aura/google_wallpapers/1-nature0_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE1_LARGE" file="aura/google_wallpapers/large/1-nature1.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE1_SMALL" file="aura/google_wallpapers/small/1-nature1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_1_NATURE1" file="aura/google_wallpapers/1-nature1.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_1_NATURE1_THUMB" file="aura/google_wallpapers/1-nature1_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE2_LARGE" file="aura/google_wallpapers/large/1-nature2.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE2_SMALL" file="aura/google_wallpapers/small/1-nature2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_1_NATURE2" file="aura/google_wallpapers/1-nature2.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_1_NATURE2_THUMB" file="aura/google_wallpapers/1-nature2_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE3_LARGE" file="aura/google_wallpapers/large/1-nature3.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE3_SMALL" file="aura/google_wallpapers/small/1-nature3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_1_NATURE3" file="aura/google_wallpapers/1-nature3.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_1_NATURE3_THUMB" file="aura/google_wallpapers/1-nature3_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE4_LARGE" file="aura/google_wallpapers/large/1-nature4.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE4_SMALL" file="aura/google_wallpapers/small/1-nature4.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_1_NATURE4" file="aura/google_wallpapers/1-nature4.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_1_NATURE4_THUMB" file="aura/google_wallpapers/1-nature4_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE5_LARGE" file="aura/google_wallpapers/large/1-nature5.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE5_SMALL" file="aura/google_wallpapers/small/1-nature5.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_1_NATURE5" file="aura/google_wallpapers/1-nature5.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_1_NATURE5_THUMB" file="aura/google_wallpapers/1-nature5_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE6_LARGE" file="aura/google_wallpapers/large/1-nature6.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE6_SMALL" file="aura/google_wallpapers/small/1-nature6.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_1_NATURE6" file="aura/google_wallpapers/1-nature6.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_1_NATURE6_THUMB" file="aura/google_wallpapers/1-nature6_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE7_LARGE" file="aura/google_wallpapers/large/1-nature7.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE7_SMALL" file="aura/google_wallpapers/small/1-nature7.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_1_NATURE7" file="aura/google_wallpapers/1-nature7.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_1_NATURE7_THUMB" file="aura/google_wallpapers/1-nature7_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_LARGE" file="aura/google_wallpapers/large/2-landscape0.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_SMALL" file="aura/google_wallpapers/small/2-landscape0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0" file="aura/google_wallpapers/2-landscape0.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_THUMB" file="aura/google_wallpapers/2-landscape0_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_LARGE" file="aura/google_wallpapers/large/2-landscape1.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_SMALL" file="aura/google_wallpapers/small/2-landscape1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1" file="aura/google_wallpapers/2-landscape1.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_THUMB" file="aura/google_wallpapers/2-landscape1_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_LARGE" file="aura/google_wallpapers/large/2-landscape2.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_SMALL" file="aura/google_wallpapers/small/2-landscape2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2" file="aura/google_wallpapers/2-landscape2.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_THUMB" file="aura/google_wallpapers/2-landscape2_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_LARGE" file="aura/google_wallpapers/large/2-landscape3.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_SMALL" file="aura/google_wallpapers/small/2-landscape3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3" file="aura/google_wallpapers/2-landscape3.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_THUMB" file="aura/google_wallpapers/2-landscape3_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_LARGE" file="aura/google_wallpapers/large/2-landscape4.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_SMALL" file="aura/google_wallpapers/small/2-landscape4.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4" file="aura/google_wallpapers/2-landscape4.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB" file="aura/google_wallpapers/2-landscape4_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_LARGE" file="aura/google_wallpapers/large/2-landscape5.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_SMALL" file="aura/google_wallpapers/small/2-landscape5.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5" file="aura/google_wallpapers/2-landscape5.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB" file="aura/google_wallpapers/2-landscape5_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_LARGE" file="aura/google_wallpapers/large/2-landscape6.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_SMALL" file="aura/google_wallpapers/small/2-landscape6.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6" file="aura/google_wallpapers/2-landscape6.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB" file="aura/google_wallpapers/2-landscape6_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_LARGE" file="aura/google_wallpapers/large/2-landscape7.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_SMALL" file="aura/google_wallpapers/small/2-landscape7.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7" file="aura/google_wallpapers/2-landscape7.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB" file="aura/google_wallpapers/2-landscape7_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN0_LARGE" file="aura/google_wallpapers/large/3-urban0.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN0_SMALL" file="aura/google_wallpapers/small/3-urban0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_3_URBAN0" file="aura/google_wallpapers/3-urban0.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_3_URBAN0_THUMB" file="aura/google_wallpapers/3-urban0_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN1_LARGE" file="aura/google_wallpapers/large/3-urban1.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN1_SMALL" file="aura/google_wallpapers/small/3-urban1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_3_URBAN1" file="aura/google_wallpapers/3-urban1.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_3_URBAN1_THUMB" file="aura/google_wallpapers/3-urban1_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN2_LARGE" file="aura/google_wallpapers/large/3-urban2.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN2_SMALL" file="aura/google_wallpapers/small/3-urban2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_3_URBAN2" file="aura/google_wallpapers/3-urban2.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_3_URBAN2_THUMB" file="aura/google_wallpapers/3-urban2_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN3_LARGE" file="aura/google_wallpapers/large/3-urban3.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN3_SMALL" file="aura/google_wallpapers/small/3-urban3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_3_URBAN3" file="aura/google_wallpapers/3-urban3.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_3_URBAN3_THUMB" file="aura/google_wallpapers/3-urban3_thumb.png" type="BINDATA" /> </if> <!-- Wallpapers (gradients) used by Ash. --> <if expr="pp_ifdef('use_ash')"> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT0_LARGE" file="aura/wallpapers/large/5-gradient0.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT0_SMALL" file="aura/wallpapers/small/5-gradient0.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_5_GRADIENT0" file="aura/wallpapers/5-gradient0.png" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT0_THUMB" file="aura/wallpapers/5-gradient0_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_LARGE" file="aura/wallpapers/large/5-gradient1.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_SMALL" file="aura/wallpapers/small/5-gradient1.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1" file="aura/wallpapers/5-gradient1.png" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_THUMB" file="aura/wallpapers/5-gradient1_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_LARGE" file="aura/wallpapers/large/5-gradient2.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_SMALL" file="aura/wallpapers/small/5-gradient2.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2" file="aura/wallpapers/5-gradient2.png" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_THUMB" file="aura/wallpapers/5-gradient2_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_LARGE" file="aura/wallpapers/large/5-gradient3.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_SMALL" file="aura/wallpapers/small/5-gradient3.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3" file="aura/wallpapers/5-gradient3.png" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_THUMB" file="aura/wallpapers/5-gradient3_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_LARGE" file="aura/wallpapers/large/5-gradient4.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_SMALL" file="aura/wallpapers/small/5-gradient4.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4" file="aura/wallpapers/5-gradient4.png" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_THUMB" file="aura/wallpapers/5-gradient4_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE" file="aura/wallpapers/large/5-gradient5.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL" file="aura/wallpapers/small/5-gradient5.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5" file="aura/wallpapers/5-gradient5.png" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB" file="aura/wallpapers/5-gradient5_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_LARGE" file="aura/wallpapers/large/5-gradient6.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_SMALL" file="aura/wallpapers/small/5-gradient6.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6" file="aura/wallpapers/5-gradient6.png" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB" file="aura/wallpapers/5-gradient6_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_LARGE" file="aura/wallpapers/large/5-gradient7.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_SMALL" file="aura/wallpapers/small/5-gradient7.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7" file="aura/wallpapers/5-gradient7.png" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB" file="aura/wallpapers/5-gradient7_thumb.png" type="BINDATA" /> </if> </includes> |