chrome/chrome_dll.gypi - Issue 7663001: Make bubble_border use resources under ui/resources.

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/chrome_dll.gypi

Issue 7663001: Make bubble_border use resources under ui/resources. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Merge Created 9 years, 4 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/chrome_dll.gypi

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi

index d7ed0ee1f2002cebae21ca545f5ff7e626b974b1..18d8fa0968e0de0d950f1f4ff9bbaf8b6005bbcf 100644

--- a/chrome/chrome_dll.gypi

+++ b/chrome/chrome_dll.gypi

@@ -135,6 +135,7 @@

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

'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_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',

@@ -343,6 +344,7 @@

'<(grit_out_dir)/theme_resources_standard.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)/webkit/webkit_chromium_resources.pak',

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

« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »