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

Unified Diff: ash/ash.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: don't guard ash_strings with aura=1 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
« no previous file with comments | « ash/DEPS ('k') | ash/ash_resources.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index b3e961216dc2f4325f1c8efe8b06925c4fd42fb5..6b4f47f214e4bfd1b234ef7f359c2b0e460a0e3a 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -7,7 +7,9 @@
'chromium_code': 1,
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
},
-
+ 'includes': [
+ 'ash_resources.gypi',
+ ],
'targets': [
{
'target_name': 'ash',
@@ -36,6 +38,7 @@
'../ui/views/controls/webview/webview.gyp:webview',
'../ui/views/views.gyp:views',
'../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
+ 'ash_resources',
],
'defines': [
'ASH_IMPLEMENTATION',
@@ -441,6 +444,7 @@
'../ui/views/views.gyp:views_examples_with_content_lib',
'../ui/views/views.gyp:test_support_views',
'ash',
+ 'ash_resources',
],
'sources': [
'../ui/views/test/test_views_delegate.cc',
@@ -582,6 +586,7 @@
'../ui/views/views.gyp:views_examples_with_content_lib',
'../ui/views/views.gyp:test_support_views',
'ash',
+ 'ash_resources',
],
'sources': [
'shell/app_list.cc',
« no previous file with comments | « ash/DEPS ('k') | ash/ash_resources.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698