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

Side by Side Diff: trunk/src/content/content_tests.gypi

Issue 259103003: Revert 266616 "Move DefaultActivationClient to wm/core" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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': 'layouttest_support_content', 8 'target_name': 'layouttest_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'conditions': [ 10 'conditions': [
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 }], 298 }],
299 ['use_glib == 1', { 299 ['use_glib == 1', {
300 'dependencies': [ 300 'dependencies': [
301 '../build/linux/system.gyp:glib', 301 '../build/linux/system.gyp:glib',
302 ], 302 ],
303 }], 303 }],
304 ['use_aura==1', { 304 ['use_aura==1', {
305 'dependencies': [ 305 'dependencies': [
306 '../ui/aura/aura.gyp:aura_test_support', 306 '../ui/aura/aura.gyp:aura_test_support',
307 '../ui/resources/ui_resources.gyp:ui_test_pak', 307 '../ui/resources/ui_resources.gyp:ui_test_pak',
308 '../ui/wm/wm.gyp:wm',
309 ], 308 ],
310 }], 309 }],
311 ['use_aura==1 or OS=="mac"', { 310 ['use_aura==1 or OS=="mac"', {
312 'dependencies': [ 311 'dependencies': [
313 '../ui/compositor/compositor.gyp:compositor', 312 '../ui/compositor/compositor.gyp:compositor',
314 ], 313 ],
315 }], 314 }],
316 ['OS=="win"', { 315 ['OS=="win"', {
317 'dependencies': [ 316 'dependencies': [
318 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 317 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 'dependencies': [ 851 'dependencies': [
853 '../chromeos/chromeos.gyp:chromeos', 852 '../chromeos/chromeos.gyp:chromeos',
854 ], 853 ],
855 'sources/': [ 854 'sources/': [
856 ['exclude', '^browser/geolocation/wifi_data_provider_linux_unittest. cc'], 855 ['exclude', '^browser/geolocation/wifi_data_provider_linux_unittest. cc'],
857 ], 856 ],
858 }], 857 }],
859 ['use_aura==1', { 858 ['use_aura==1', {
860 'dependencies': [ 859 'dependencies': [
861 '../ui/aura/aura.gyp:aura', 860 '../ui/aura/aura.gyp:aura',
862 '../ui/wm/wm.gyp:wm',
863 ] 861 ]
864 }], 862 }],
865 ['use_aura==1 or toolkit_views==1', { 863 ['use_aura==1 or toolkit_views==1', {
866 'dependencies': [ 864 'dependencies': [
867 '../ui/events/events.gyp:events_test_support', 865 '../ui/events/events.gyp:events_test_support',
868 ], 866 ],
869 }], 867 }],
870 ['use_aura!=1 and OS!="mac"', { 868 ['use_aura!=1 and OS!="mac"', {
871 'sources/': [ 869 'sources/': [
872 ['exclude', '^browser/compositor/'], 870 ['exclude', '^browser/compositor/'],
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
1830 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1828 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1831 }, 1829 },
1832 ], 1830 ],
1833 }], 1831 }],
1834 ], 1832 ],
1835 }, 1833 },
1836 ], 1834 ],
1837 }], 1835 }],
1838 ], 1836 ],
1839 } 1837 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698