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

Unified Diff: chrome/chrome_resources.gyp

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: presubmit.py Created 8 years, 3 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: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 66f8a88f76fdcb4b3154e7f12a24c255782afd93..4f48abd3b2ecf6661d2913675b23904d87a576e5 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -264,8 +264,6 @@
'chrome_strings',
'platform_locale_settings',
'theme_resources',
- # TODO(zork): Protect this with if use_aura==1
- '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
'<(DEPTH)/content/content_resources.gyp:content_resources',
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
@@ -301,6 +299,12 @@
},
],
'conditions': [
+ ['use_aura==1', {
+ 'dependencies': [
+ '<(DEPTH)/ash/ash.gyp:ash_resources',
+ '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
+ ],
+ }],
['OS != "mac"', {
# Copy pak files to the product directory. These files will be picked
# up by the following installer scripts:

Powered by Google App Engine
This is Rietveld 408576698