build/common.gypi - Issue 6975051: Remove COMPOSITOR_2 flag, old compositor code.

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: build/common.gypi

Issue 6975051: Remove COMPOSITOR_2 flag, old compositor code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Change conditional compile defines. Created 9 years, 6 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: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 54d06d3941859fc149ad07afe0f5b1a616621c32..11c5a34170a7f5c4612e4c58aa8ec04e39c8cba9 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -653,8 +653,7 @@

'defines': ['TOOLKIT_VIEWS=1'],

}],

['views_compositor==1', {

- # TODO(sky): nuke COMPOSITOR_2 when we remove it from views.

- 'defines': ['VIEWS_COMPOSITOR=1', 'COMPOSITOR_2=1'],

+ 'defines': ['VIEWS_COMPOSITOR=1'],

}],

['chromeos==1', {

'defines': ['OS_CHROMEOS=1'],

« no previous file with comments | « no previous file | chrome/browser/ui/views/wrench_menu.cc » ('j') | no next file with comments »