content/content_tests.gypi - Issue 698253004: Reland: Implement Aura side of unified touch text selection for contents

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: content/content_tests.gypi

Issue 698253004: Reland: Implement Aura side of unified touch text selection for contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed test failures 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

« content/browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc ('K') | « content/content_browser.gypi ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index 5f9eb4c41d7b05e6213472bda332ef21fb3698c8..040fe084700613ef9ba185bac475164f95363594 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -232,6 +232,7 @@

'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',

@@ -246,7 +247,6 @@

'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',

@@ -1438,11 +1438,6 @@

'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',

@@ -1518,6 +1513,15 @@

'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', {

'sources': [ '<@(content_browsertests_webrtc_sources)' ],

'dependencies': [