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

Unified 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, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_browser.gypi ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 9095f33d4c3ec696355e164bbd316dfb4dea836d..ed1a1569db651b2c2b880fe8d7e5dc46d96a9052 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -232,7 +232,6 @@
'browser/net_info_browsertest.cc',
'browser/renderer_host/input/touch_action_browsertest.cc',
'browser/renderer_host/input/touch_input_browsertest.cc',
- 'browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc',
'browser/renderer_host/render_message_filter_browsertest.cc',
'browser/renderer_host/render_process_host_browsertest.cc',
'browser/renderer_host/render_view_host_browsertest.cc',
@@ -247,6 +246,7 @@
'browser/tracing/background_tracing_manager_browsertest.cc',
'browser/tracing/tracing_controller_browsertest.cc',
'browser/web_contents/opened_by_dom_browsertest.cc',
+ 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
'browser/web_contents/web_contents_impl_browsertest.cc',
'browser/web_contents/web_contents_view_aura_browsertest.cc',
'browser/webkit_browsertest.cc',
@@ -1441,6 +1441,11 @@
],
'sources': [ '<@(content_browsertests_sources)' ],
'conditions': [
+ ['chromeos==0', {
+ 'sources!': [
+ 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
+ ],
+ }],
['OS=="win"', {
'resource_include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit',
@@ -1514,15 +1519,6 @@
['use_aura!=1 and OS!="mac"', {
'sources!' :[
'browser/compositor/image_transport_factory_browsertest.cc',
- ],
- }],
- ['use_aura==1', {
- 'dependencies': [
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection',
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_test_support',
- ]}, {
- 'sources!': [
- 'browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc',
],
}],
['enable_webrtc==1', {
« 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