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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/resources/ui_resources.grd
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index e3f3ea00a21d7221a81a617b6d79ba4354a07b76..8751f6c0fca0754d3fa62f9435741da32cc68b9c 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -175,24 +175,25 @@
<include name="IDR_AURA_SHADOW_SMALL_BOTTOM" file="aura/small_shadow_bottom.png" type="BINDATA" />
<include name="IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT" file="aura/small_shadow_bottom_right.png" type="BINDATA" />
<include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_1" file="aura/wallpaper_1.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_1_THUMB" file="aura/wallpaper_1_thumb.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_2" file="aura/wallpaper_2.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_2_THUMB" file="aura/wallpaper_2_thumb.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_3" file="aura/wallpaper_3.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_3_THUMB" file="aura/wallpaper_3_thumb.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_4" file="aura/wallpaper_4.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_4_THUMB" file="aura/wallpaper_4_thumb.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_5" file="aura/wallpaper_5.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_5_THUMB" file="aura/wallpaper_5_thumb.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_6" file="aura/wallpaper_6.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_6_THUMB" file="aura/wallpaper_6_thumb.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_7" file="aura/wallpaper_7.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_7_THUMB" file="aura/wallpaper_7_thumb.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_8" file="aura/wallpaper_8.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_8_THUMB" file="aura/wallpaper_8_thumb.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_9" file="aura/wallpaper_9.jpg" type="BINDATA" />
- <include name="IDR_AURA_WALLPAPER_9_THUMB" file="aura/wallpaper_9_thumb.jpg" type="BINDATA" />
+ <!-- TODO(bshe): Change the file names to follow the IDR naming rules. -->
+ <include name="IDR_AURA_WALLPAPER" file="aura/wallpaper_1.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_THUMB" file="aura/wallpaper_1_thumb.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_1" file="aura/wallpaper_2.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_1_THUMB" file="aura/wallpaper_2_thumb.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_2" file="aura/wallpaper_3.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_2_THUMB" file="aura/wallpaper_3_thumb.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_3" file="aura/wallpaper_4.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_3_THUMB" file="aura/wallpaper_4_thumb.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_4" file="aura/wallpaper_5.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_4_THUMB" file="aura/wallpaper_5_thumb.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_5" file="aura/wallpaper_6.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_5_THUMB" file="aura/wallpaper_6_thumb.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_6" file="aura/wallpaper_7.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_6_THUMB" file="aura/wallpaper_7_thumb.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_7" file="aura/wallpaper_8.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_7_THUMB" file="aura/wallpaper_8_thumb.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_8" file="aura/wallpaper_9.jpg" type="BINDATA" />
+ <include name="IDR_AURA_WALLPAPER_8_THUMB" file="aura/wallpaper_9_thumb.jpg" type="BINDATA" />
<include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="aura/window_button_separator.png" type="BINDATA" />
<include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" type="BINDATA" />
<include name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" type="BINDATA" />
« 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