diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 03:13:15 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 03:13:15 +0000 |
| commit | 056ab7e6e22b705db43acddf506cfaf300e43513 (patch) | |
| tree | d2ac44418c1d853efd4004e3f6098369c557a2ff /chrome | |
| parent | c1d408717c9b72cdacbc981e467b866fe560181b (diff) | |
| download | chromium_src-056ab7e6e22b705db43acddf506cfaf300e43513.zip chromium_src-056ab7e6e22b705db43acddf506cfaf300e43513.tar.gz chromium_src-056ab7e6e22b705db43acddf506cfaf300e43513.tar.bz2 | |
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
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_resources.gyp | 2 | ||||
| -rwxr-xr-x | chrome/tools/check_grd_for_unused_strings.py | 3 |
3 files changed, 4 insertions, 3 deletions
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'), ] |