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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/resources/ash_wallpaper_resources.grd

Issue 18298009: chromeos: Remove use_spring_wallpaper and use_oem_wallpaper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/ash_wallpaper_resources.h" type="rc_header"> 4 <output filename="grit/ash_wallpaper_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="ash_wallpaper_resources.pak" type="data_package" /> 7 <output filename="ash_wallpaper_resources.pak" type="data_package" />
8 <output filename="ash_wallpaper_resources.rc" type="rc_all" /> 8 <output filename="ash_wallpaper_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
11 <includes> 11 <includes>
12 <!-- Wallpapers available to Ash when building Official ChromeOS. --> 12 <!-- Wallpapers available to Ash when building Official ChromeOS. -->
13 <if expr="pp_ifdef('_google_chrome')"> 13 <if expr="pp_ifdef('_google_chrome')">
14 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_LARGE" file="google_wall papers/large/2-landscape7.jpg" type="BINDATA" /> 14 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_LARGE" file="google_wall papers/large/2-landscape7.jpg" type="BINDATA" />
15 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_SMALL" file="google_wall papers/small/2-landscape7.jpg" type="BINDATA" /> 15 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_SMALL" file="google_wall papers/small/2-landscape7.jpg" type="BINDATA" />
16 <if expr="not pp_ifdef('use_oem_wallpaper') and not pp_ifdef('use_spring _wallpaper')"> 16 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wall papers/large/2-landscape8.jpg" type="BINDATA" />
17 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wa llpapers/large/2-landscape8.jpg" type="BINDATA" /> 17 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wall papers/small/2-landscape8.jpg" type="BINDATA" />
18 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wa llpapers/small/2-landscape8.jpg" type="BINDATA" />
19 </if>
20 <if expr="pp_ifdef('use_oem_wallpaper') and not pp_ifdef('use_spring_wal lpaper')">
21 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wa llpapers/large/oem1.jpg" type="BINDATA" />
22 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wa llpapers/small/oem1.jpg" type="BINDATA" />
23 </if>
24 <if expr="not pp_ifdef('use_oem_wallpaper') and pp_ifdef('use_spring_wal lpaper')">
25 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wa llpapers/large/spring.jpg" type="BINDATA" />
26 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wa llpapers/small/spring.jpg" type="BINDATA" />
27 </if>
28 </if> 18 </if>
29 <!-- Wallpapers (gradients) used by Ash. --> 19 <!-- Wallpapers (gradients) used by Ash. -->
30 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE" file="wallpapers/lar ge/5-gradient5.jpg" type="BINDATA" /> 20 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE" file="wallpapers/lar ge/5-gradient5.jpg" type="BINDATA" />
31 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL" file="wallpapers/sma ll/5-gradient5.jpg" type="BINDATA" /> 21 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL" file="wallpapers/sma ll/5-gradient5.jpg" type="BINDATA" />
32 </includes> 22 </includes>
33 </release> 23 </release>
34 </grit> 24 </grit>
OLDNEW
« 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