diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 20:36:17 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 20:36:17 +0000 |
| commit | 1a384f28ed6adf1e81360335d6e32e05da96d339 (patch) | |
| tree | 3a23ca774dd1769a8e1aa07b6aeff60b62a09bcc /ash | |
| parent | a40675c06e4ec720f430c4a37ee84159295715e8 (diff) | |
| download | chromium_src-1a384f28ed6adf1e81360335d6e32e05da96d339.zip chromium_src-1a384f28ed6adf1e81360335d6e32e05da96d339.tar.gz chromium_src-1a384f28ed6adf1e81360335d6e32e05da96d339.tar.bz2 | |
Merge 160219 - Adding alternate wallpaper.
BUG=153820
Review URL: https://chromiumcodereview.appspot.com/11064002
TBR=saintlou@chromium.org
Review URL: https://codereview.chromium.org/11096007
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@160695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/resources/ash_wallpaper_resources.grd | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ash/resources/ash_wallpaper_resources.grd b/ash/resources/ash_wallpaper_resources.grd index 6e1c9a51..8a253e2 100644 --- a/ash/resources/ash_wallpaper_resources.grd +++ b/ash/resources/ash_wallpaper_resources.grd @@ -65,9 +65,18 @@ <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_LARGE" file="google_wallpapers/large/2-landscape7.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_SMALL" file="google_wallpapers/small/2-landscape7.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB" file="google_wallpapers/2-landscape7_thumb.png" type="BINDATA" /> + </if> + <if expr="pp_ifdef('_google_chrome') and not pp_ifdef('use_oem_wallpaper')"> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wallpapers/large/2-landscape8.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wallpapers/small/2-landscape8.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_THUMB" file="google_wallpapers/2-landscape8_thumb.png" type="BINDATA" /> + </if> + <if expr="pp_ifdef('_google_chrome') and pp_ifdef('use_oem_wallpaper')"> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wallpapers/large/oem1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wallpapers/small/oem1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_THUMB" file="google_wallpapers/oem1_thumb.png" type="BINDATA" /> + </if> + <if expr="pp_ifdef('_google_chrome')"> <include name="IDR_AURA_WALLPAPERS_3_URBAN0_LARGE" file="google_wallpapers/large/3-urban0.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_3_URBAN0_SMALL" file="google_wallpapers/small/3-urban0.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_3_URBAN0_THUMB" file="google_wallpapers/3-urban0_thumb.png" type="BINDATA" /> |