chrome/chrome_repack_chrome_100_percent.gypi - Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_repack_chrome_100_percent.gypi

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

Index: chrome/chrome_repack_chrome_100_percent.gypi

diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi

index 875959334a49e5084cd0343d0f164a55ed5fdb1d..da717c95d7d0a2bb201cb98a51fd614e5c494dbb 100644

--- a/chrome/chrome_repack_chrome_100_percent.gypi

+++ b/chrome/chrome_repack_chrome_100_percent.gypi

@@ -9,6 +9,13 @@

'<(grit_out_dir)/theme_resources_100_percent.pak',

'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',

+ 'conditions': [

+ ['use_aura==1', {

+ 'pak_inputs': [

+ '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_100_percent.pak',

+ ],

+ }],

+ ],

'inputs': [

'<(repack_path)',

« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_repack_chrome_200_percent.gypi » ('j') | no next file with comments »