ash/resources/ash_wallpaper_resources.grd - Issue 16544004: Add use_spring_wallpaper flag for Spring default wallpaper

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/resources/ash_wallpaper_resources.grd

Issue 16544004: Add use_spring_wallpaper flag for Spring default wallpaper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/resources/ash_wallpaper_resources.grd

diff --git a/ash/resources/ash_wallpaper_resources.grd b/ash/resources/ash_wallpaper_resources.grd

index dc7a0a4c3ba1cca12a9d2baa22f8a6efb5c50c23..1cfcdd6f7d53d44ea9be6a9e73c53d4452ec05fc 100644

--- a/ash/resources/ash_wallpaper_resources.grd

+++ b/ash/resources/ash_wallpaper_resources.grd

@@ -13,14 +13,18 @@

- </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>

« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »