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
cbchan · Sep 14, 2012 · 056ab7e · 056ab7e
1 parent c1d4087
commit 056ab7e
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 123 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → ash/resources/ash_wallpaper_resources.grd b/ui/resources/ui_resources_wallpapers.grd → ash/resources/ash_wallpaper_resources.grd
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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' ],
-        }],
-      ],
-    },
   ],
 }