Move wallpapers to ash/resource

TBR=sky@chromium.org
BUG=141663
TEST=none

Review URL: https://codereview.chromium.org/10910264

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156728 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 122 insertions, 123 deletions

diff --git a/ash/DEPS b/ash/DEPS
index 5681827..3ea2b58 100644
--- a/ash/DEPS
+++ b/ash/DEPS
@@ -3,8 +3,8 @@ include_rules = [
   "+content/public",
   "+grit/ash_resources.h",
   "+grit/ash_strings.h",
+  "+grit/ash_wallpaper_resources.h",
   "+grit/ui_resources.h",
-  "+grit/ui_resources_wallpapers.h",
   "+grit/ui_strings.h",
   "+skia/ext",
   "+third_party/cros_system_api",
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 6b4f47f..07f3e07 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -34,11 +34,11 @@
         '../ui/oak/oak.gyp:oak',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
-        '../ui/ui.gyp:ui_resources_wallpapers',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/views.gyp:views',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         'ash_resources',
+        'ash_wallpaper_resources',
       ],
       'defines': [
         'ASH_IMPLEMENTATION',
diff --git a/ash/ash_resources.gypi b/ash/ash_resources.gypi
index 5c2d62a..cdec48d 100644
--- a/ash/ash_resources.gypi
+++ b/ash/ash_resources.gypi
@@ -25,5 +25,26 @@
         ],
       },
     },
+    {
+      'target_name': 'ash_wallpaper_resources',
+      'type': 'none',
+      'conditions': [
+        ['use_ash==1', {
+          'variables': {
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources',
+          },
+          'actions': [
+            {
+              'action_name': 'ash_wallpapers_resources',
+              'variables': {
+                'grit_grd_file': 'resources/ash_wallpaper_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+          ],
+          'includes': [ '../build/grit_target.gypi' ],
+        }],
+      ],
+    },
   ],
 }
diff --git a/ash/desktop_background/desktop_background_resources.cc b/ash/desktop_background/desktop_background_resources.cc
index aceb6c7..3573bcf 100644
--- a/ash/desktop_background/desktop_background_resources.cc
+++ b/ash/desktop_background/desktop_background_resources.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/rand_util.h"
-#include "grit/ui_resources_wallpapers.h"
+#include "grit/ash_wallpaper_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
diff --git a/ui/resources/ui_resources_wallpapers.grd b/ash/resources/ash_wallpaper_resources.grd
index f41eac5..6e1c9a51 100644
--- a/ui/resources/ui_resources_wallpapers.grd
+++ b/ash/resources/ash_wallpaper_resources.grd
@@ -1,111 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grit latest_public_release="0" current_release="1">
   <outputs>
-    <output filename="grit/ui_resources_wallpapers.h" type="rc_header">
+    <output filename="grit/ash_wallpaper_resources.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="ui_resources_wallpapers.pak" type="data_package" />
+    <output filename="ash_wallpaper_resources.pak" type="data_package" />
   </outputs>
   <release seq="1">
-    <!-- TODO(benrg): These are really ash resources. Move them into
-         src/ash/resources. -->
     <includes>
       <!-- Wallpapers used by Ash when building ChromiumOS. -->
       <if expr="not pp_ifdef('_google_chrome')">
-        <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_LARGE" file="aura/wallpapers/large/romainguy_0.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_SMALL" file="aura/wallpapers/small/romainguy_0.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_THUMB" file="aura/wallpapers/romainguy_0_thumb.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_LARGE" file="wallpapers/large/romainguy_0.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_SMALL" file="wallpapers/small/romainguy_0.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_THUMB" file="wallpapers/romainguy_0_thumb.jpg" type="BINDATA" />
       </if>
 
       <!-- Wallpapers available to Ash when building Official ChromeOS. -->
       <if expr="pp_ifdef('_google_chrome')">
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE0_LARGE" file="aura/google_wallpapers/large/1-nature0.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE0_SMALL" file="aura/google_wallpapers/small/1-nature0.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE0_THUMB" file="aura/google_wallpapers/1-nature0_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE1_LARGE" file="aura/google_wallpapers/large/1-nature1.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE1_SMALL" file="aura/google_wallpapers/small/1-nature1.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE1_THUMB" file="aura/google_wallpapers/1-nature1_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE2_LARGE" file="aura/google_wallpapers/large/1-nature2.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE2_SMALL" file="aura/google_wallpapers/small/1-nature2.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE2_THUMB" file="aura/google_wallpapers/1-nature2_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE3_LARGE" file="aura/google_wallpapers/large/1-nature3.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE3_SMALL" file="aura/google_wallpapers/small/1-nature3.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE3_THUMB" file="aura/google_wallpapers/1-nature3_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE4_LARGE" file="aura/google_wallpapers/large/1-nature4.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE4_SMALL" file="aura/google_wallpapers/small/1-nature4.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE4_THUMB" file="aura/google_wallpapers/1-nature4_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE5_LARGE" file="aura/google_wallpapers/large/1-nature5.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE5_SMALL" file="aura/google_wallpapers/small/1-nature5.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE5_THUMB" file="aura/google_wallpapers/1-nature5_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE6_LARGE" file="aura/google_wallpapers/large/1-nature6.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE6_SMALL" file="aura/google_wallpapers/small/1-nature6.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE6_THUMB" file="aura/google_wallpapers/1-nature6_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE7_LARGE" file="aura/google_wallpapers/large/1-nature7.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE7_SMALL" file="aura/google_wallpapers/small/1-nature7.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_1_NATURE7_THUMB" file="aura/google_wallpapers/1-nature7_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_LARGE" file="aura/google_wallpapers/large/2-landscape0.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_SMALL" file="aura/google_wallpapers/small/2-landscape0.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_THUMB" file="aura/google_wallpapers/2-landscape0_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_LARGE" file="aura/google_wallpapers/large/2-landscape1.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_SMALL" file="aura/google_wallpapers/small/2-landscape1.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_THUMB" file="aura/google_wallpapers/2-landscape1_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_LARGE" file="aura/google_wallpapers/large/2-landscape2.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_SMALL" file="aura/google_wallpapers/small/2-landscape2.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_THUMB" file="aura/google_wallpapers/2-landscape2_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_LARGE" file="aura/google_wallpapers/large/2-landscape3.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_SMALL" file="aura/google_wallpapers/small/2-landscape3.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_THUMB" file="aura/google_wallpapers/2-landscape3_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_LARGE" file="aura/google_wallpapers/large/2-landscape4.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_SMALL" file="aura/google_wallpapers/small/2-landscape4.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB" file="aura/google_wallpapers/2-landscape4_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_LARGE" file="aura/google_wallpapers/large/2-landscape5.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_SMALL" file="aura/google_wallpapers/small/2-landscape5.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB" file="aura/google_wallpapers/2-landscape5_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_LARGE" file="aura/google_wallpapers/large/2-landscape6.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_SMALL" file="aura/google_wallpapers/small/2-landscape6.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB" file="aura/google_wallpapers/2-landscape6_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_LARGE" file="aura/google_wallpapers/large/2-landscape7.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_SMALL" file="aura/google_wallpapers/small/2-landscape7.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB" file="aura/google_wallpapers/2-landscape7_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE" file="aura/google_wallpapers/large/2-landscape8.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL" file="aura/google_wallpapers/small/2-landscape8.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE8_THUMB" file="aura/google_wallpapers/2-landscape8_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN0_LARGE" file="aura/google_wallpapers/large/3-urban0.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN0_SMALL" file="aura/google_wallpapers/small/3-urban0.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN0_THUMB" file="aura/google_wallpapers/3-urban0_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN1_LARGE" file="aura/google_wallpapers/large/3-urban1.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN1_SMALL" file="aura/google_wallpapers/small/3-urban1.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN1_THUMB" file="aura/google_wallpapers/3-urban1_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN2_LARGE" file="aura/google_wallpapers/large/3-urban2.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN2_SMALL" file="aura/google_wallpapers/small/3-urban2.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN2_THUMB" file="aura/google_wallpapers/3-urban2_thumb.png" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN3_LARGE" file="aura/google_wallpapers/large/3-urban3.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN3_SMALL" file="aura/google_wallpapers/small/3-urban3.jpg" type="BINDATA" />
-        <include name="IDR_AURA_WALLPAPERS_3_URBAN3_THUMB" file="aura/google_wallpapers/3-urban3_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE0_LARGE" file="google_wallpapers/large/1-nature0.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE0_SMALL" file="google_wallpapers/small/1-nature0.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE0_THUMB" file="google_wallpapers/1-nature0_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE1_LARGE" file="google_wallpapers/large/1-nature1.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE1_SMALL" file="google_wallpapers/small/1-nature1.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE1_THUMB" file="google_wallpapers/1-nature1_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE2_LARGE" file="google_wallpapers/large/1-nature2.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE2_SMALL" file="google_wallpapers/small/1-nature2.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE2_THUMB" file="google_wallpapers/1-nature2_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE3_LARGE" file="google_wallpapers/large/1-nature3.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE3_SMALL" file="google_wallpapers/small/1-nature3.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE3_THUMB" file="google_wallpapers/1-nature3_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE4_LARGE" file="google_wallpapers/large/1-nature4.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE4_SMALL" file="google_wallpapers/small/1-nature4.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE4_THUMB" file="google_wallpapers/1-nature4_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE5_LARGE" file="google_wallpapers/large/1-nature5.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE5_SMALL" file="google_wallpapers/small/1-nature5.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE5_THUMB" file="google_wallpapers/1-nature5_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE6_LARGE" file="google_wallpapers/large/1-nature6.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE6_SMALL" file="google_wallpapers/small/1-nature6.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE6_THUMB" file="google_wallpapers/1-nature6_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE7_LARGE" file="google_wallpapers/large/1-nature7.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE7_SMALL" file="google_wallpapers/small/1-nature7.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_1_NATURE7_THUMB" file="google_wallpapers/1-nature7_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_LARGE" file="google_wallpapers/large/2-landscape0.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_SMALL" file="google_wallpapers/small/2-landscape0.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_THUMB" file="google_wallpapers/2-landscape0_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_LARGE" file="google_wallpapers/large/2-landscape1.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_SMALL" file="google_wallpapers/small/2-landscape1.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_THUMB" file="google_wallpapers/2-landscape1_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_LARGE" file="google_wallpapers/large/2-landscape2.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_SMALL" file="google_wallpapers/small/2-landscape2.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_THUMB" file="google_wallpapers/2-landscape2_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_LARGE" file="google_wallpapers/large/2-landscape3.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_SMALL" file="google_wallpapers/small/2-landscape3.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_THUMB" file="google_wallpapers/2-landscape3_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_LARGE" file="google_wallpapers/large/2-landscape4.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_SMALL" file="google_wallpapers/small/2-landscape4.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB" file="google_wallpapers/2-landscape4_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_LARGE" file="google_wallpapers/large/2-landscape5.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_SMALL" file="google_wallpapers/small/2-landscape5.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB" file="google_wallpapers/2-landscape5_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_LARGE" file="google_wallpapers/large/2-landscape6.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_SMALL" file="google_wallpapers/small/2-landscape6.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB" file="google_wallpapers/2-landscape6_thumb.png" type="BINDATA" />
+        <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" />
+        <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" />
+        <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" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN1_LARGE" file="google_wallpapers/large/3-urban1.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN1_SMALL" file="google_wallpapers/small/3-urban1.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN1_THUMB" file="google_wallpapers/3-urban1_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN2_LARGE" file="google_wallpapers/large/3-urban2.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN2_SMALL" file="google_wallpapers/small/3-urban2.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN2_THUMB" file="google_wallpapers/3-urban2_thumb.png" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN3_LARGE" file="google_wallpapers/large/3-urban3.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN3_SMALL" file="google_wallpapers/small/3-urban3.jpg" type="BINDATA" />
+        <include name="IDR_AURA_WALLPAPERS_3_URBAN3_THUMB" file="google_wallpapers/3-urban3_thumb.png" type="BINDATA" />
       </if>
 
       <!-- Wallpapers (gradients) used by Ash. -->
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_LARGE" file="aura/wallpapers/large/5-gradient1.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_SMALL" file="aura/wallpapers/small/5-gradient1.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_THUMB" file="aura/wallpapers/5-gradient1_thumb.png" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_LARGE" file="aura/wallpapers/large/5-gradient2.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_SMALL" file="aura/wallpapers/small/5-gradient2.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_THUMB" file="aura/wallpapers/5-gradient2_thumb.png" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_LARGE" file="aura/wallpapers/large/5-gradient3.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_SMALL" file="aura/wallpapers/small/5-gradient3.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_THUMB" file="aura/wallpapers/5-gradient3_thumb.png" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_LARGE" file="aura/wallpapers/large/5-gradient4.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_SMALL" file="aura/wallpapers/small/5-gradient4.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_THUMB" file="aura/wallpapers/5-gradient4_thumb.png" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE" file="aura/wallpapers/large/5-gradient5.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL" file="aura/wallpapers/small/5-gradient5.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB" file="aura/wallpapers/5-gradient5_thumb.png" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_LARGE" file="aura/wallpapers/large/5-gradient6.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_SMALL" file="aura/wallpapers/small/5-gradient6.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB" file="aura/wallpapers/5-gradient6_thumb.png" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_LARGE" file="aura/wallpapers/large/5-gradient7.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_SMALL" file="aura/wallpapers/small/5-gradient7.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB" file="aura/wallpapers/5-gradient7_thumb.png" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_LARGE" file="wallpapers/large/5-gradient1.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_SMALL" file="wallpapers/small/5-gradient1.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_THUMB" file="wallpapers/5-gradient1_thumb.png" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_LARGE" file="wallpapers/large/5-gradient2.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_SMALL" file="wallpapers/small/5-gradient2.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_THUMB" file="wallpapers/5-gradient2_thumb.png" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_LARGE" file="wallpapers/large/5-gradient3.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_SMALL" file="wallpapers/small/5-gradient3.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_THUMB" file="wallpapers/5-gradient3_thumb.png" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_LARGE" file="wallpapers/large/5-gradient4.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_SMALL" file="wallpapers/small/5-gradient4.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_THUMB" file="wallpapers/5-gradient4_thumb.png" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE" file="wallpapers/large/5-gradient5.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL" file="wallpapers/small/5-gradient5.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB" file="wallpapers/5-gradient5_thumb.png" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_LARGE" file="wallpapers/large/5-gradient6.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_SMALL" file="wallpapers/small/5-gradient6.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB" file="wallpapers/5-gradient6_thumb.png" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_LARGE" file="wallpapers/large/5-gradient7.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_SMALL" file="wallpapers/small/5-gradient7.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB" file="wallpapers/5-gradient7_thumb.png" type="BINDATA" />
     </includes>
   </release>
 </grit>
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index 8dedcd8..f98baf0 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -20,7 +20,7 @@
       }],
       ['use_ash==1', {
         'pak_inputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_wallpapers.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.pak',
         ],
       }],
     ],
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 94075ef..8018ceb 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -270,7 +270,6 @@
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
-        '<(DEPTH)/ui/ui.gyp:ui_resources_wallpapers',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
       ],
@@ -304,6 +303,7 @@
         ['use_aura==1', {
           'dependencies': [
              '<(DEPTH)/ash/ash.gyp:ash_resources',
+             '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources',
           ],
         }],
         ['OS != "mac"', {
diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py
index fa757b1..eb7ed1f 100755
--- a/chrome/tools/check_grd_for_unused_strings.py
+++ b/chrome/tools/check_grd_for_unused_strings.py
@@ -134,6 +134,8 @@ def main():
     ui_base_strings_dir = os.path.join(ui_base_dir, 'strings')
     grd_files = [
       os.path.join(ash_base_dir, 'ash_strings.grd'),
+      os.path.join(ash_base_dir, 'resources', 'ash_resources.grd'),
+      os.path.join(ash_base_dir, 'resources', 'ash_wallpaper_resources.grd'),
       os.path.join(chrome_app_dir, 'chromium_strings.grd'),
       os.path.join(chrome_app_dir, 'generated_resources.grd'),
       os.path.join(chrome_app_dir, 'google_chrome_strings.grd'),
@@ -149,7 +151,6 @@ def main():
       os.path.join(chrome_dir, 'renderer', 'resources',
                    'renderer_resources.grd'),
       os.path.join(src_dir, 'ui', 'resources', 'ui_resources.grd'),
-      os.path.join(src_dir, 'ui', 'resources', 'ui_resources_wallpapers.grd'),
       os.path.join(ui_base_strings_dir, 'app_locale_settings.grd'),
       os.path.join(ui_base_strings_dir, 'ui_strings.grd'),
     ]
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index a3facee..2539774 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -48,14 +48,14 @@
   "webkit/tools/test_shell/test_shell_resources.grd": {
     "includes": [5000],
   },
-  "ui/resources/ui_resources_wallpapers.grd": {
-    "includes": [5500],
-  },
   "ui/resources/ui_resources.grd": {
-    "structures": [6000],
+    "structures": [5500],
   },
   "ash/resources/ash_resources.grd": {
-    "structures": [6200],
+    "structures": [5900],
+  },
+  "ash/resources/ash_wallpaper_resources.grd": {
+    "includes": [6300],
   },
   "chrome/app/theme/theme_resources.grd": {
     "includes": [6500],
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index 8dc9d43..a872ec8 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -31,26 +31,5 @@
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
-    {
-      'target_name': 'ui_resources_wallpapers',
-      'type': 'none',
-      'conditions': [
-        ['use_ash==1', {
-          'variables': {
-            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources',
-          },
-          'actions': [
-            {
-              'action_name': 'ui_resources_wallpapers',
-              'variables': {
-                'grit_grd_file': 'resources/ui_resources_wallpapers.grd',
-              },
-              'includes': [ '../build/grit_action.gypi' ],
-            },
-          ],
-          'includes': [ '../build/grit_target.gypi' ],
-        }],
-      ],
-    },
   ],
 }