Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: ui/aura/aura.gyp

Issue 10377155: Move ui/gfx/resources to ui/base/native_theme/resources Step2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep gfx_resources.pak for DumpRenderTree Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/aura/aura.gyp
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 48c38334a4ec0bc21c115702092fc766abe5a504..c9716f98e211a75bed8ee7084060a56409112ce2 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -16,7 +16,7 @@
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../skia/skia.gyp:skia',
'../compositor/compositor.gyp:compositor',
- '../ui.gyp:gfx_resources',
+ '../ui.gyp:native_theme_resources',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'../ui.gyp:ui_resources_2x',
@@ -203,7 +203,7 @@
'../../third_party/icu/icu.gyp:icuuc',
'../compositor/compositor.gyp:compositor',
'../compositor/compositor.gyp:compositor_test_support',
- '../ui.gyp:gfx_resources',
+ '../ui.gyp:native_theme_resources',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'aura',
@@ -213,7 +213,7 @@
],
'sources': [
'demo/demo_main.cc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/base/native_theme/native_theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
],
},
@@ -228,7 +228,7 @@
'../compositor/compositor.gyp:compositor_test_support',
'../compositor/compositor.gyp:compositor',
'../gl/gl.gyp:gl',
- '../ui.gyp:gfx_resources',
+ '../ui.gyp:native_theme_resources',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'test_support_aura',
@@ -247,7 +247,7 @@
'event_filter_unittest.cc',
'event_unittest.cc',
'window_unittest.cc',
- '<(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': [
« no previous file with comments | « ui/DEPS ('k') | ui/base/native_theme/native_theme_android.cc » ('j') | ui/views/views.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698