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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <includes> 10 <includes>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB" file="google_wall papers/2-landscape4_thumb.png" type="BINDATA" /> 58 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB" file="google_wall papers/2-landscape4_thumb.png" type="BINDATA" />
59 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_LARGE" file="google_wall papers/large/2-landscape5.jpg" type="BINDATA" /> 59 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_LARGE" file="google_wall papers/large/2-landscape5.jpg" type="BINDATA" />
60 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_SMALL" file="google_wall papers/small/2-landscape5.jpg" type="BINDATA" /> 60 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_SMALL" file="google_wall papers/small/2-landscape5.jpg" type="BINDATA" />
61 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB" file="google_wall papers/2-landscape5_thumb.png" type="BINDATA" /> 61 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB" file="google_wall papers/2-landscape5_thumb.png" type="BINDATA" />
62 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_LARGE" file="google_wall papers/large/2-landscape6.jpg" type="BINDATA" /> 62 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_LARGE" file="google_wall papers/large/2-landscape6.jpg" type="BINDATA" />
63 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_SMALL" file="google_wall papers/small/2-landscape6.jpg" type="BINDATA" /> 63 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_SMALL" file="google_wall papers/small/2-landscape6.jpg" type="BINDATA" />
64 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB" file="google_wall papers/2-landscape6_thumb.png" type="BINDATA" /> 64 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB" file="google_wall papers/2-landscape6_thumb.png" type="BINDATA" />
65 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_LARGE" file="google_wall papers/large/2-landscape7.jpg" type="BINDATA" /> 65 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_LARGE" file="google_wall papers/large/2-landscape7.jpg" type="BINDATA" />
66 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_SMALL" file="google_wall papers/small/2-landscape7.jpg" type="BINDATA" /> 66 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_SMALL" file="google_wall papers/small/2-landscape7.jpg" type="BINDATA" />
67 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB" file="google_wall papers/2-landscape7_thumb.png" type="BINDATA" /> 67 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB" file="google_wall papers/2-landscape7_thumb.png" type="BINDATA" />
68 </if>
69 <if expr="pp_ifdef('_google_chrome') and not pp_ifdef('use_oem_wallpaper') ">
68 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wall papers/large/2-landscape8.jpg" type="BINDATA" /> 70 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wall papers/large/2-landscape8.jpg" type="BINDATA" />
69 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wall papers/small/2-landscape8.jpg" type="BINDATA" /> 71 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wall papers/small/2-landscape8.jpg" type="BINDATA" />
70 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_THUMB" file="google_wall papers/2-landscape8_thumb.png" type="BINDATA" /> 72 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_THUMB" file="google_wall papers/2-landscape8_thumb.png" type="BINDATA" />
73 </if>
74 <if expr="pp_ifdef('_google_chrome') and pp_ifdef('use_oem_wallpaper')">
75 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="google_wall papers/large/oem1.jpg" type="BINDATA" />
76 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="google_wall papers/small/oem1.jpg" type="BINDATA" />
77 <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_THUMB" file="google_wall papers/oem1_thumb.png" type="BINDATA" />
78 </if>
79 <if expr="pp_ifdef('_google_chrome')">
71 <include name="IDR_AURA_WALLPAPERS_3_URBAN0_LARGE" file="google_wallpape rs/large/3-urban0.jpg" type="BINDATA" /> 80 <include name="IDR_AURA_WALLPAPERS_3_URBAN0_LARGE" file="google_wallpape rs/large/3-urban0.jpg" type="BINDATA" />
72 <include name="IDR_AURA_WALLPAPERS_3_URBAN0_SMALL" file="google_wallpape rs/small/3-urban0.jpg" type="BINDATA" /> 81 <include name="IDR_AURA_WALLPAPERS_3_URBAN0_SMALL" file="google_wallpape rs/small/3-urban0.jpg" type="BINDATA" />
73 <include name="IDR_AURA_WALLPAPERS_3_URBAN0_THUMB" file="google_wallpape rs/3-urban0_thumb.png" type="BINDATA" /> 82 <include name="IDR_AURA_WALLPAPERS_3_URBAN0_THUMB" file="google_wallpape rs/3-urban0_thumb.png" type="BINDATA" />
74 <include name="IDR_AURA_WALLPAPERS_3_URBAN1_LARGE" file="google_wallpape rs/large/3-urban1.jpg" type="BINDATA" /> 83 <include name="IDR_AURA_WALLPAPERS_3_URBAN1_LARGE" file="google_wallpape rs/large/3-urban1.jpg" type="BINDATA" />
75 <include name="IDR_AURA_WALLPAPERS_3_URBAN1_SMALL" file="google_wallpape rs/small/3-urban1.jpg" type="BINDATA" /> 84 <include name="IDR_AURA_WALLPAPERS_3_URBAN1_SMALL" file="google_wallpape rs/small/3-urban1.jpg" type="BINDATA" />
76 <include name="IDR_AURA_WALLPAPERS_3_URBAN1_THUMB" file="google_wallpape rs/3-urban1_thumb.png" type="BINDATA" /> 85 <include name="IDR_AURA_WALLPAPERS_3_URBAN1_THUMB" file="google_wallpape rs/3-urban1_thumb.png" type="BINDATA" />
77 <include name="IDR_AURA_WALLPAPERS_3_URBAN2_LARGE" file="google_wallpape rs/large/3-urban2.jpg" type="BINDATA" /> 86 <include name="IDR_AURA_WALLPAPERS_3_URBAN2_LARGE" file="google_wallpape rs/large/3-urban2.jpg" type="BINDATA" />
78 <include name="IDR_AURA_WALLPAPERS_3_URBAN2_SMALL" file="google_wallpape rs/small/3-urban2.jpg" type="BINDATA" /> 87 <include name="IDR_AURA_WALLPAPERS_3_URBAN2_SMALL" file="google_wallpape rs/small/3-urban2.jpg" type="BINDATA" />
79 <include name="IDR_AURA_WALLPAPERS_3_URBAN2_THUMB" file="google_wallpape rs/3-urban2_thumb.png" type="BINDATA" /> 88 <include name="IDR_AURA_WALLPAPERS_3_URBAN2_THUMB" file="google_wallpape rs/3-urban2_thumb.png" type="BINDATA" />
80 <include name="IDR_AURA_WALLPAPERS_3_URBAN3_LARGE" file="google_wallpape rs/large/3-urban3.jpg" type="BINDATA" /> 89 <include name="IDR_AURA_WALLPAPERS_3_URBAN3_LARGE" file="google_wallpape rs/large/3-urban3.jpg" type="BINDATA" />
(...skipping 19 matching lines...) Expand all
100 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB" file="wallpapers/5-g radient5_thumb.png" type="BINDATA" /> 109 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB" file="wallpapers/5-g radient5_thumb.png" type="BINDATA" />
101 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_LARGE" file="wallpapers/lar ge/5-gradient6.jpg" type="BINDATA" /> 110 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_LARGE" file="wallpapers/lar ge/5-gradient6.jpg" type="BINDATA" />
102 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_SMALL" file="wallpapers/sma ll/5-gradient6.jpg" type="BINDATA" /> 111 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_SMALL" file="wallpapers/sma ll/5-gradient6.jpg" type="BINDATA" />
103 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB" file="wallpapers/5-g radient6_thumb.png" type="BINDATA" /> 112 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB" file="wallpapers/5-g radient6_thumb.png" type="BINDATA" />
104 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_LARGE" file="wallpapers/lar ge/5-gradient7.jpg" type="BINDATA" /> 113 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_LARGE" file="wallpapers/lar ge/5-gradient7.jpg" type="BINDATA" />
105 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_SMALL" file="wallpapers/sma ll/5-gradient7.jpg" type="BINDATA" /> 114 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_SMALL" file="wallpapers/sma ll/5-gradient7.jpg" type="BINDATA" />
106 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB" file="wallpapers/5-g radient7_thumb.png" type="BINDATA" /> 115 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB" file="wallpapers/5-g radient7_thumb.png" type="BINDATA" />
107 </includes> 116 </includes>
108 </release> 117 </release>
109 </grit> 118 </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