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

Side by Side Diff: content/content_tests.gypi

Issue 1263703004: Revert of Implement Aura side of unified touch text selection for contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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:
View unified diff | Download patch
« no previous file with comments | « content/content_browser.gypi ('k') | content/renderer/render_widget.cc » ('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) 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 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 'browser/media/encrypted_media_browsertest.cc', 225 'browser/media/encrypted_media_browsertest.cc',
226 'browser/media/media_browsertest.cc', 226 'browser/media/media_browsertest.cc',
227 'browser/media/media_browsertest.h', 227 'browser/media/media_browsertest.h',
228 'browser/media/media_canplaytype_browsertest.cc', 228 'browser/media/media_canplaytype_browsertest.cc',
229 'browser/media/media_source_browsertest.cc', 229 'browser/media/media_source_browsertest.cc',
230 'browser/message_port_provider_browsertest.cc', 230 'browser/message_port_provider_browsertest.cc',
231 'browser/mojo_shell_browsertest.cc', 231 'browser/mojo_shell_browsertest.cc',
232 'browser/net_info_browsertest.cc', 232 'browser/net_info_browsertest.cc',
233 'browser/renderer_host/input/touch_action_browsertest.cc', 233 'browser/renderer_host/input/touch_action_browsertest.cc',
234 'browser/renderer_host/input/touch_input_browsertest.cc', 234 'browser/renderer_host/input/touch_input_browsertest.cc',
235 'browser/renderer_host/input/touch_selection_controller_client_aura_browse rtest.cc',
236 'browser/renderer_host/render_message_filter_browsertest.cc', 235 'browser/renderer_host/render_message_filter_browsertest.cc',
237 'browser/renderer_host/render_process_host_browsertest.cc', 236 'browser/renderer_host/render_process_host_browsertest.cc',
238 'browser/renderer_host/render_view_host_browsertest.cc', 237 'browser/renderer_host/render_view_host_browsertest.cc',
239 'browser/renderer_host/render_widget_host_view_browsertest.cc', 238 'browser/renderer_host/render_widget_host_view_browsertest.cc',
240 'browser/screen_orientation/screen_orientation_browsertest.cc', 239 'browser/screen_orientation/screen_orientation_browsertest.cc',
241 'browser/security_exploit_browsertest.cc', 240 'browser/security_exploit_browsertest.cc',
242 'browser/service_worker/service_worker_browsertest.cc', 241 'browser/service_worker/service_worker_browsertest.cc',
243 'browser/session_history_browsertest.cc', 242 'browser/session_history_browsertest.cc',
244 'browser/shared_worker/worker_browsertest.cc', 243 'browser/shared_worker/worker_browsertest.cc',
245 'browser/site_per_process_browsertest.cc', 244 'browser/site_per_process_browsertest.cc',
246 'browser/site_per_process_browsertest.h', 245 'browser/site_per_process_browsertest.h',
247 'browser/tracing/background_tracing_manager_browsertest.cc', 246 'browser/tracing/background_tracing_manager_browsertest.cc',
248 'browser/tracing/tracing_controller_browsertest.cc', 247 'browser/tracing/tracing_controller_browsertest.cc',
249 'browser/web_contents/opened_by_dom_browsertest.cc', 248 'browser/web_contents/opened_by_dom_browsertest.cc',
249 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
250 'browser/web_contents/web_contents_impl_browsertest.cc', 250 'browser/web_contents/web_contents_impl_browsertest.cc',
251 'browser/web_contents/web_contents_view_aura_browsertest.cc', 251 'browser/web_contents/web_contents_view_aura_browsertest.cc',
252 'browser/webkit_browsertest.cc', 252 'browser/webkit_browsertest.cc',
253 'browser/webui/web_ui_mojo_browsertest.cc', 253 'browser/webui/web_ui_mojo_browsertest.cc',
254 'child/child_thread_impl_browsertest.cc', 254 'child/child_thread_impl_browsertest.cc',
255 'child/site_isolation_stats_gatherer_browsertest.cc', 255 'child/site_isolation_stats_gatherer_browsertest.cc',
256 'renderer/accessibility/renderer_accessibility_browsertest.cc', 256 'renderer/accessibility/renderer_accessibility_browsertest.cc',
257 'renderer/devtools/v8_sampling_profiler_browsertest.cc', 257 'renderer/devtools/v8_sampling_profiler_browsertest.cc',
258 'renderer/gin_browsertest.cc', 258 'renderer/gin_browsertest.cc',
259 'renderer/history_controller_browsertest.cc', 259 'renderer/history_controller_browsertest.cc',
(...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after
1434 '<(SHARED_INTERMEDIATE_DIR)', # Needed by encrypted_media_browserte st.cc 1434 '<(SHARED_INTERMEDIATE_DIR)', # Needed by encrypted_media_browserte st.cc
1435 ], 1435 ],
1436 'includes': [ 1436 'includes': [
1437 'browser/gpu/test_support_gpu.gypi', 1437 'browser/gpu/test_support_gpu.gypi',
1438 ], 1438 ],
1439 'defines': [ 1439 'defines': [
1440 'HAS_OUT_OF_PROC_TEST_RUNNER', 1440 'HAS_OUT_OF_PROC_TEST_RUNNER',
1441 ], 1441 ],
1442 'sources': [ '<@(content_browsertests_sources)' ], 1442 'sources': [ '<@(content_browsertests_sources)' ],
1443 'conditions': [ 1443 'conditions': [
1444 ['chromeos==0', {
1445 'sources!': [
1446 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
1447 ],
1448 }],
1444 ['OS=="win"', { 1449 ['OS=="win"', {
1445 'resource_include_dirs': [ 1450 'resource_include_dirs': [
1446 '<(SHARED_INTERMEDIATE_DIR)/webkit', 1451 '<(SHARED_INTERMEDIATE_DIR)/webkit',
1447 ], 1452 ],
1448 'sources': [ 1453 'sources': [
1449 '<@(content_browsertests_win_sources)', 1454 '<@(content_browsertests_win_sources)',
1450 # TODO: It would be nice to have these pulled in 1455 # TODO: It would be nice to have these pulled in
1451 # automatically from direct_dependent_settings in 1456 # automatically from direct_dependent_settings in
1452 # their various targets (net.gyp:net_resources, etc.), 1457 # their various targets (net.gyp:net_resources, etc.),
1453 # but that causes errors in other targets when 1458 # but that causes errors in other targets when
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 ['use_aura==1 or toolkit_views==1', { 1514 ['use_aura==1 or toolkit_views==1', {
1510 'dependencies': [ 1515 'dependencies': [
1511 '../ui/events/events.gyp:events_test_support', 1516 '../ui/events/events.gyp:events_test_support',
1512 ], 1517 ],
1513 }], 1518 }],
1514 ['use_aura!=1 and OS!="mac"', { 1519 ['use_aura!=1 and OS!="mac"', {
1515 'sources!' :[ 1520 'sources!' :[
1516 'browser/compositor/image_transport_factory_browsertest.cc', 1521 'browser/compositor/image_transport_factory_browsertest.cc',
1517 ], 1522 ],
1518 }], 1523 }],
1519 ['use_aura==1', {
1520 'dependencies': [
1521 '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection ',
1522 '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection _test_support',
1523 ]}, {
1524 'sources!': [
1525 'browser/renderer_host/input/touch_selection_controller_client_a ura_browsertest.cc',
1526 ],
1527 }],
1528 ['enable_webrtc==1', { 1524 ['enable_webrtc==1', {
1529 'sources': [ '<@(content_browsertests_webrtc_sources)' ], 1525 'sources': [ '<@(content_browsertests_webrtc_sources)' ],
1530 'dependencies': [ 1526 'dependencies': [
1531 '../testing/perf/perf_test.gyp:perf_test', 1527 '../testing/perf/perf_test.gyp:perf_test',
1532 ], 1528 ],
1533 }], 1529 }],
1534 ['enable_plugins==1', { 1530 ['enable_plugins==1', {
1535 'sources': [ '<@(content_browsertests_plugins_sources)' ], 1531 'sources': [ '<@(content_browsertests_plugins_sources)' ],
1536 'dependencies': [ 1532 'dependencies': [
1537 '../ppapi/ppapi_internal.gyp:ppapi_tests', 1533 '../ppapi/ppapi_internal.gyp:ppapi_tests',
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
2106 ], 2102 ],
2107 }, 2103 },
2108 'includes': [ 2104 'includes': [
2109 '../build/host_jar.gypi', 2105 '../build/host_jar.gypi',
2110 ], 2106 ],
2111 }, 2107 },
2112 ], 2108 ],
2113 }], 2109 }],
2114 ], 2110 ],
2115 } 2111 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698