diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 20:26:20 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 20:26:20 +0000 |
| commit | 0e455397dcd9b3de1b6a27c3ee02f08c42986500 (patch) | |
| tree | 30faff5ec0774ba9e38ff9b01f6556baff1048f4 | |
| parent | b339ab0e3731fdc78936dfbf1a77a3fe0b22e2e7 (diff) | |
| download | chromium_src-0e455397dcd9b3de1b6a27c3ee02f08c42986500.zip chromium_src-0e455397dcd9b3de1b6a27c3ee02f08c42986500.tar.gz chromium_src-0e455397dcd9b3de1b6a27c3ee02f08c42986500.tar.bz2 | |
Merge 204682 "Add use_spring_wallpaper flag for Spring default w..."
> Add use_spring_wallpaper flag for Spring default wallpaper
>
>
> BUG=247072
>
> Review URL: https://chromiumcodereview.appspot.com/16544004
TBR=bshe@chromium.org
Review URL: https://codereview.chromium.org/16515009
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204908 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/resources/ash_wallpaper_resources.grd | 20 | ||||
| -rw-r--r-- | build/common.gypi | 7 |
2 files changed, 19 insertions, 8 deletions
diff --git a/ash/resources/ash_wallpaper_resources.grd b/ash/resources/ash_wallpaper_resources.grd index dc7a0a4..1cfcdd6 100644 --- a/ash/resources/ash_wallpaper_resources.grd +++ b/ash/resources/ash_wallpaper_resources.grd @@ -13,14 +13,18 @@ <if expr="pp_ifdef('_google_chrome')"> <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" /> - </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" /> - </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" /> + <if expr="not pp_ifdef('use_oem_wallpaper') and not pp_ifdef('use_spring_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" /> + </if> + <if expr="pp_ifdef('use_oem_wallpaper') and not pp_ifdef('use_spring_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" /> + </if> + <if expr="not pp_ifdef('use_oem_wallpaper') and pp_ifdef('use_spring_wallpaper')"> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wallpapers/large/spring.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wallpapers/small/spring.jpg" type="BINDATA" /> + </if> </if> <!-- Wallpapers (gradients) used by Ash. --> <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE" file="wallpapers/large/5-gradient5.jpg" type="BINDATA" /> diff --git a/build/common.gypi b/build/common.gypi index 6452ffa..147863e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -356,6 +356,9 @@ # Enables autofill dialog and associated features; disabled by default. 'enable_autofill_dialog%' : 0, + # Uses spring wallpaper resources on Spring. + 'use_spring_wallpaper%': 0, + # Uses OEM-specific wallpaper resources on Chrome OS. 'use_oem_wallpaper%': 0, @@ -798,6 +801,7 @@ 'enable_session_service%': '<(enable_session_service)', 'enable_themes%': '<(enable_themes)', 'enable_autofill_dialog%': '<(enable_autofill_dialog)', + 'use_spring_wallpaper%': '<(use_spring_wallpaper)', 'use_oem_wallpaper%': '<(use_oem_wallpaper)', 'enable_background%': '<(enable_background)', 'linux_use_gold_binary%': '<(linux_use_gold_binary)', @@ -1536,6 +1540,9 @@ ['enable_themes==1', { 'grit_defines': ['-D', 'enable_themes'], }], + ['use_spring_wallpaper==1', { + 'grit_defines': ['-D', 'use_spring_wallpaper'], + }], ['use_oem_wallpaper==1', { 'grit_defines': ['-D', 'use_oem_wallpaper'], }], |