summaryrefslogtreecommitdiffstats
path: root/ui/compositor/compositor.gyp
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 /ui/compositor/compositor.gyp
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 'ui/compositor/compositor.gyp')
-rw-r--r--ui/compositor/compositor.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 99eebe9..09eabf5 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -61,7 +61,7 @@
# TODO(sky): before we make this real need to remove
# IDR_BITMAP_BRUSH_IMAGE.
'dependencies': [
- '<(DEPTH)/ui/ui.gyp:gfx_resources',
+ '<(DEPTH)/ui/ui.gyp:native_theme_resources',
'<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',
'<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
],
@@ -123,7 +123,7 @@
'test/test_suite.h',
'test/test_utils.cc',
'test/test_utils.h',
- '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc'
],
'conditions': [