Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Side by Side Diff: content/content_tests.gypi

Issue 9225038: Fold views_compositor=1 into use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 ['toolkit_uses_gtk == 1', { 134 ['toolkit_uses_gtk == 1', {
135 'dependencies': [ 135 'dependencies': [
136 '../build/linux/system.gyp:gtk', 136 '../build/linux/system.gyp:gtk',
137 ], 137 ],
138 }], 138 }],
139 ['use_glib == 1', { 139 ['use_glib == 1', {
140 'dependencies': [ 140 'dependencies': [
141 '../build/linux/system.gyp:glib', 141 '../build/linux/system.gyp:glib',
142 ], 142 ],
143 }], 143 }],
144 ['views_compositor==1', { 144 ['use_aura==1', {
145 'dependencies': [ 145 'dependencies': [
146 '../ui/gfx/compositor/compositor.gyp:compositor', 146 '../ui/gfx/compositor/compositor.gyp:compositor',
147 ], 147 ],
148 }], 148 }],
149 ], 149 ],
150 }, 150 },
151 { 151 {
152 'target_name': 'content_unittests', 152 'target_name': 'content_unittests',
153 'type': 'executable', 153 'type': 'executable',
154 'defines!': ['CONTENT_IMPLEMENTATION'], 154 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 ], 466 ],
467 'sources': [ 467 'sources': [
468 'common/gpu/media/video_decode_accelerator_unittest.cc', 468 'common/gpu/media/video_decode_accelerator_unittest.cc',
469 ], 469 ],
470 } 470 }
471 ], 471 ],
472 }, 472 },
473 ], 473 ],
474 ], 474 ],
475 } 475 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698