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

Unified Diff: ui/ui.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/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 478ff6fafb35f5d6f38e0cc1dcbc6376f5c114ca..69de51112bea9bd851f9bf54837063613423c45d 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -30,7 +30,7 @@
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/zlib/zlib.gyp:zlib',
'base/strings/ui_strings.gyp:ui_strings',
- 'gfx_resources',
+ 'native_theme_resources',
'<(libjpeg_gyp_path):libjpeg',
],
'defines': [
@@ -684,20 +684,30 @@
],
},
{
- 'target_name': 'gfx_resources',
+ 'target_name': 'native_theme_resources',
'type': 'none',
'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx',
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme',
},
'actions': [
{
- 'action_name': 'gfx_resources',
+ 'action_name': 'native_theme_resources',
'variables': {
- 'grit_grd_file': 'gfx/gfx_resources.grd',
+ 'grit_grd_file': 'base/native_theme/resources/native_theme_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
],
+ # gfx_resources.pak is used by DumpRenderTree.
+ # TODO(oshima): Update DumpRenderTree.gyp to use new pak file and
+ # remove this.
+ 'copies': [ {
+ 'destination': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/',
+ 'files' : [
+ '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/gfx_resources.pak',
+ ],
+ },
+ ],
'includes': [ '../build/grit_target.gypi' ],
},
],

Powered by Google App Engine
This is Rietveld 408576698