chrome/chrome.gyp - 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.gyp

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.gyp

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

index 46544a9dbd093bdae64dc69c23904719c7d70a83..dd4d302bacd9abcb88b42c5981a5171b5ef9e46b 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -1650,10 +1650,12 @@

['touchui==0', {

'pak_inputs': [

'<(grit_out_dir)/theme_resources_standard.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',

}, { # else: touchui!=0

'pak_inputs': [

'<(grit_out_dir)/theme_resources_large.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resources_large.pak',

}],

« no previous file with comments | « chrome/browser/ui/views/bubble/bubble_border.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »