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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/resources/ui_resources.grd

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to trunk Created 8 years, 9 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 | « chrome/chrome_browser.gypi ('k') | no next file » | 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/ui_resources.h" type="rc_header"> 4 <output filename="grit/ui_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="ui_resources.pak" type="data_package" /> 7 <output filename="ui_resources.pak" type="data_package" />
8 <output filename="ui_resources.rc" type="rc_all" /> 8 <output filename="ui_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 <include name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT" file="aura/window_ shadow_inactive_bottom_right.png" type="BINDATA" /> 168 <include name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT" file="aura/window_ shadow_inactive_bottom_right.png" type="BINDATA" />
169 <include name="IDR_AURA_SHADOW_SMALL_TOP_LEFT" file="aura/small_shadow_t op_left.png" type="BINDATA" /> 169 <include name="IDR_AURA_SHADOW_SMALL_TOP_LEFT" file="aura/small_shadow_t op_left.png" type="BINDATA" />
170 <include name="IDR_AURA_SHADOW_SMALL_TOP" file="aura/small_shadow_top.pn g" type="BINDATA" /> 170 <include name="IDR_AURA_SHADOW_SMALL_TOP" file="aura/small_shadow_top.pn g" type="BINDATA" />
171 <include name="IDR_AURA_SHADOW_SMALL_TOP_RIGHT" file="aura/small_shadow_ top_right.png" type="BINDATA" /> 171 <include name="IDR_AURA_SHADOW_SMALL_TOP_RIGHT" file="aura/small_shadow_ top_right.png" type="BINDATA" />
172 <include name="IDR_AURA_SHADOW_SMALL_LEFT" file="aura/small_shadow_left. png" type="BINDATA" /> 172 <include name="IDR_AURA_SHADOW_SMALL_LEFT" file="aura/small_shadow_left. png" type="BINDATA" />
173 <include name="IDR_AURA_SHADOW_SMALL_RIGHT" file="aura/small_shadow_righ t.png" type="BINDATA" /> 173 <include name="IDR_AURA_SHADOW_SMALL_RIGHT" file="aura/small_shadow_righ t.png" type="BINDATA" />
174 <include name="IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT" file="aura/small_shado w_bottom_left.png" type="BINDATA" /> 174 <include name="IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT" file="aura/small_shado w_bottom_left.png" type="BINDATA" />
175 <include name="IDR_AURA_SHADOW_SMALL_BOTTOM" file="aura/small_shadow_bot tom.png" type="BINDATA" /> 175 <include name="IDR_AURA_SHADOW_SMALL_BOTTOM" file="aura/small_shadow_bot tom.png" type="BINDATA" />
176 <include name="IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT" file="aura/small_shad ow_bottom_right.png" type="BINDATA" /> 176 <include name="IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT" file="aura/small_shad ow_bottom_right.png" type="BINDATA" />
177 <include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BIN DATA" /> 177 <include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BIN DATA" />
178 <include name="IDR_AURA_WALLPAPER_1" file="aura/wallpaper_1.jpg" type="B INDATA" /> 178 <!-- TODO(bshe): Change the file names to follow the IDR naming rules. - ->
179 <include name="IDR_AURA_WALLPAPER_1_THUMB" file="aura/wallpaper_1_thumb. jpg" type="BINDATA" /> 179 <include name="IDR_AURA_WALLPAPER" file="aura/wallpaper_1.jpg" type="BIN DATA" />
180 <include name="IDR_AURA_WALLPAPER_2" file="aura/wallpaper_2.jpg" type="B INDATA" /> 180 <include name="IDR_AURA_WALLPAPER_THUMB" file="aura/wallpaper_1_thumb.jp g" type="BINDATA" />
181 <include name="IDR_AURA_WALLPAPER_2_THUMB" file="aura/wallpaper_2_thumb. jpg" type="BINDATA" /> 181 <include name="IDR_AURA_WALLPAPER_1" file="aura/wallpaper_2.jpg" type="B INDATA" />
182 <include name="IDR_AURA_WALLPAPER_3" file="aura/wallpaper_3.jpg" type="B INDATA" /> 182 <include name="IDR_AURA_WALLPAPER_1_THUMB" file="aura/wallpaper_2_thumb. jpg" type="BINDATA" />
183 <include name="IDR_AURA_WALLPAPER_3_THUMB" file="aura/wallpaper_3_thumb. jpg" type="BINDATA" /> 183 <include name="IDR_AURA_WALLPAPER_2" file="aura/wallpaper_3.jpg" type="B INDATA" />
184 <include name="IDR_AURA_WALLPAPER_4" file="aura/wallpaper_4.jpg" type="B INDATA" /> 184 <include name="IDR_AURA_WALLPAPER_2_THUMB" file="aura/wallpaper_3_thumb. jpg" type="BINDATA" />
185 <include name="IDR_AURA_WALLPAPER_4_THUMB" file="aura/wallpaper_4_thumb. jpg" type="BINDATA" /> 185 <include name="IDR_AURA_WALLPAPER_3" file="aura/wallpaper_4.jpg" type="B INDATA" />
186 <include name="IDR_AURA_WALLPAPER_5" file="aura/wallpaper_5.jpg" type="B INDATA" /> 186 <include name="IDR_AURA_WALLPAPER_3_THUMB" file="aura/wallpaper_4_thumb. jpg" type="BINDATA" />
187 <include name="IDR_AURA_WALLPAPER_5_THUMB" file="aura/wallpaper_5_thumb. jpg" type="BINDATA" /> 187 <include name="IDR_AURA_WALLPAPER_4" file="aura/wallpaper_5.jpg" type="B INDATA" />
188 <include name="IDR_AURA_WALLPAPER_6" file="aura/wallpaper_6.jpg" type="B INDATA" /> 188 <include name="IDR_AURA_WALLPAPER_4_THUMB" file="aura/wallpaper_5_thumb. jpg" type="BINDATA" />
189 <include name="IDR_AURA_WALLPAPER_6_THUMB" file="aura/wallpaper_6_thumb. jpg" type="BINDATA" /> 189 <include name="IDR_AURA_WALLPAPER_5" file="aura/wallpaper_6.jpg" type="B INDATA" />
190 <include name="IDR_AURA_WALLPAPER_7" file="aura/wallpaper_7.jpg" type="B INDATA" /> 190 <include name="IDR_AURA_WALLPAPER_5_THUMB" file="aura/wallpaper_6_thumb. jpg" type="BINDATA" />
191 <include name="IDR_AURA_WALLPAPER_7_THUMB" file="aura/wallpaper_7_thumb. jpg" type="BINDATA" /> 191 <include name="IDR_AURA_WALLPAPER_6" file="aura/wallpaper_7.jpg" type="B INDATA" />
192 <include name="IDR_AURA_WALLPAPER_8" file="aura/wallpaper_8.jpg" type="B INDATA" /> 192 <include name="IDR_AURA_WALLPAPER_6_THUMB" file="aura/wallpaper_7_thumb. jpg" type="BINDATA" />
193 <include name="IDR_AURA_WALLPAPER_8_THUMB" file="aura/wallpaper_8_thumb. jpg" type="BINDATA" /> 193 <include name="IDR_AURA_WALLPAPER_7" file="aura/wallpaper_8.jpg" type="B INDATA" />
194 <include name="IDR_AURA_WALLPAPER_9" file="aura/wallpaper_9.jpg" type="B INDATA" /> 194 <include name="IDR_AURA_WALLPAPER_7_THUMB" file="aura/wallpaper_8_thumb. jpg" type="BINDATA" />
195 <include name="IDR_AURA_WALLPAPER_9_THUMB" file="aura/wallpaper_9_thumb. jpg" type="BINDATA" /> 195 <include name="IDR_AURA_WALLPAPER_8" file="aura/wallpaper_9.jpg" type="B INDATA" />
196 <include name="IDR_AURA_WALLPAPER_8_THUMB" file="aura/wallpaper_9_thumb. jpg" type="BINDATA" />
196 <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="aura/window_butto n_separator.png" type="BINDATA" /> 197 <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="aura/window_butto n_separator.png" type="BINDATA" />
197 <include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" ty pe="BINDATA" /> 198 <include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" ty pe="BINDATA" />
198 <include name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png " type="BINDATA" /> 199 <include name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png " type="BINDATA" />
199 <include name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hot.png" type="BINDATA" /> 200 <include name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hot.png" type="BINDATA" />
200 <include name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed. png" type="BINDATA" /> 201 <include name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed. png" type="BINDATA" />
201 <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fulls creen_close.png" type="BINDATA" /> 202 <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fulls creen_close.png" type="BINDATA" />
202 <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_ful lscreen_restore.png" type="BINDATA" /> 203 <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_ful lscreen_restore.png" type="BINDATA" />
203 <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_f ullscreen_separator.png" type="BINDATA" /> 204 <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_f ullscreen_separator.png" type="BINDATA" />
204 <include name="IDR_AURA_WINDOW_FULLSCREEN_SHADOW" file="aura/window_full screen_shadow.png" type="BINDATA" /> 205 <include name="IDR_AURA_WINDOW_FULLSCREEN_SHADOW" file="aura/window_full screen_shadow.png" type="BINDATA" />
205 <include name="IDR_AURA_WINDOW_HEADER_BASE_ACTIVE" file="aura/window_hea der_base_active.png" type="BINDATA" /> 206 <include name="IDR_AURA_WINDOW_HEADER_BASE_ACTIVE" file="aura/window_hea der_base_active.png" type="BINDATA" />
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="aura/status_power_s mall_all.png" type="BINDATA" /> 242 <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="aura/status_power_s mall_all.png" type="BINDATA" />
242 <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="aura/status_ne twork_airplane.png" type="BINDATA" /> 243 <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="aura/status_ne twork_airplane.png" type="BINDATA" />
243 <include name="IDR_AURA_UBER_TRAY_MORE" file="aura/status_more.png" type ="BINDATA" /> 244 <include name="IDR_AURA_UBER_TRAY_MORE" file="aura/status_more.png" type ="BINDATA" />
244 <include name="IDR_AURA_UBER_TRAY_LESS" file="aura/status_less.png" type ="BINDATA" /> 245 <include name="IDR_AURA_UBER_TRAY_LESS" file="aura/status_less.png" type ="BINDATA" />
245 246
246 <include name="IDR_OAK" file="oak.png" type="BINDATA"/> 247 <include name="IDR_OAK" file="oak.png" type="BINDATA"/>
247 </if> 248 </if>
248 </includes> 249 </includes>
249 </release> 250 </release>
250 </grit> 251 </grit>
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698