Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2889)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/resources/ash_wallpaper_resources.grd

Issue 11064002: Adding support for alternate default wallpaper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added derat@ change to common.gypi Created 8 years, 2 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/resources/ash_wallpaper_resources.grd
diff --git a/ash/resources/ash_wallpaper_resources.grd b/ash/resources/ash_wallpaper_resources.grd
index 6e1c9a51a8cb9b2db81fc9b5688eb67180b59374..8a253e25480590121c62b78b4d5f20d6ac3d527f 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" />
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698