content/content_shell.gypi - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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: content/content_shell.gypi

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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:

Index: content/content_shell.gypi

diff --git a/content/content_shell.gypi b/content/content_shell.gypi

index 4f202e8673dcd0f9838c434e7036ce3a8c7329a6..690cb694f8fc62c0b1249570cefe5605e59da374 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -211,7 +211,6 @@

'content_shell_resources',

'<(DEPTH)/net/net.gyp:net_resources',

'<(DEPTH)/ui/ui.gyp:ui_resources',

- '<(DEPTH)/ui/ui.gyp:ui_resources_standard',

'variables': {

'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',

@@ -224,8 +223,7 @@

'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',

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

- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',

'<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',

« no previous file with comments | « content/content_browser.gypi ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »