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

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

index 72e6e2091c9a512570c4e1991c31e1653a3b96b6..521eb2cbb3969842195237d2ac3dba4100b8d269 100644

--- a/ui/ui.gyp

+++ b/ui/ui.gyp

@@ -30,7 +30,7 @@

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

'../third_party/zlib/zlib.gyp:zlib',

'base/strings/ui_strings.gyp:ui_strings',

- 'ui_resources_standard',

+ 'ui_resources',

'<(libjpeg_gyp_path):libjpeg',

'defines': [