ui/ui_unittests.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: ui/ui_unittests.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: ui/ui_unittests.gypi

diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi

index 27f36acbd4368c3cf7499c5a263ea830ebf50c14..434974dc3c4d73926ba34efbb65dfae29a6e8b82 100644

--- a/ui/ui_unittests.gypi

+++ b/ui/ui_unittests.gypi

@@ -51,7 +51,7 @@

'../third_party/icu/icu.gyp:icuuc',

'../third_party/libpng/libpng.gyp:libpng',

'ui',

- 'ui_resources_standard',

+ 'ui_resources',

'ui_test_support',

'sources': [

@@ -112,7 +112,7 @@

'test/run_all_unittests.cc',

'test/test_suite.cc',

'test/test_suite.h',

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

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

'include_dirs': [

'../',