summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 21:36:04 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 21:36:04 +0000
commitf75b44c522b876d6187cb25aa27f93e5da5765a3 (patch)
treedc68ec1b5f7636e703744b22a86c65e5db241220 /webkit
parentb3dd7665842ee6b0536c6c73ce86f64963795664 (diff)
downloadchromium_src-f75b44c522b876d6187cb25aa27f93e5da5765a3.zip
chromium_src-f75b44c522b876d6187cb25aa27f93e5da5765a3.tar.gz
chromium_src-f75b44c522b876d6187cb25aa27f93e5da5765a3.tar.bz2
Move ui/gfx/resources to ui/base/native_theme/resources
Step2. - Move ui/gfx/gfx_resources.grd to ui/base/native_theme/native_theme_resources.grd -Updated gyp/DEPS/py files to use new target. -Removed old files. I had to keep the gfx_resources.pak as DumpRendererTree depends on it. I'll update DumpRendererTree first and then remove copy of gfx_resources.pak. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10377155 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index ae6d45d..852052b 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -174,7 +174,7 @@
'action_name': 'test_shell_repack',
'variables': {
'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
@@ -328,7 +328,7 @@
],
}, { # OS != "mac"
'dependencies': [
- '<(DEPTH)/ui/ui.gyp:gfx_resources',
+ '<(DEPTH)/ui/ui.gyp:native_theme_resources',
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',