chrome/test/gpu/test_support_gpu.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: chrome/test/gpu/test_support_gpu.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: merge 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/test/gpu/test_support_gpu.gypi

diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi

index ed6841d19c2100d704b75bbbcf4294b92cfc216a..22c61ef0d4da235f6448e474227ab19f9d721014 100644

--- a/chrome/test/gpu/test_support_gpu.gypi

+++ b/chrome/test/gpu/test_support_gpu.gypi

@@ -59,12 +59,10 @@

'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',

'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',

'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',

- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',

'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',

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

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

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

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

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

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