chrome/chrome_browser.gypi - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

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_browser.gypi

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixes for latest siggi review; merge with r83927 Created 9 years, 8 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_browser.gypi

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

index 83cf57a8c722ee471cae13e14f635c2a2f4ca880..cd5561c3a0b1e651f5fff3b1bf2a64f7b6b6a345 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -31,7 +31,6 @@

'../build/temp_gyp/googleurl.gyp:googleurl',

'../content/content.gyp:content_browser',

'../crypto/crypto.gyp:crypto',

- '../gpu/gpu.gyp:gpu_common',

'../media/media.gyp:media',

'../ppapi/ppapi.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin

'../printing/printing.gyp:printing',