chrome_frame/chrome_frame.gyp - 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: chrome_frame/chrome_frame.gyp

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: chrome_frame/chrome_frame.gyp

diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp

index d72dbdf46ebfa23f740d2524f0cc8e7e7b58f474..cc0c571690047e6f0b84f3a833234fd5c3c9f1bb 100644

--- a/chrome_frame/chrome_frame.gyp

+++ b/chrome_frame/chrome_frame.gyp

@@ -425,7 +425,7 @@

'test/net/test_automation_resource_message_filter.cc',

'test/net/test_automation_resource_message_filter.h',

'<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',

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

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

'test_utils.cc',

'test_utils.h',

« no previous file with comments | « chrome/tools/check_grd_for_unused_strings.py ('k') | content/DEPS » ('j') | no next file with comments »