content/content.gyp - Issue 759433002: Reland: Move TouchSelectionController from content to ui

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.gyp

Issue 759433002: Reland: Move TouchSelectionController from content to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix for ios build and some typos Created 6 years, 1 month 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/browser/web_contents/touch_editable_impl_aura_browsertest.cc ('k') | content/content_browser.gypi » ('j') | ui/base/touch/selection_bound.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content.gyp

diff --git a/content/content.gyp b/content/content.gyp

index cfa5b21516704e6ec07de138264fc7981f27f65b..c7e1c951cbb2274c166498c24c8a8156a7f67ad0 100644

--- a/content/content.gyp

+++ b/content/content.gyp

@@ -443,6 +443,7 @@

'../mojo/public/mojo_public.gyp:mojo_bindings_java',

'../net/net.gyp:net',

'../ui/android/ui_android.gyp:ui_java',

+ '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java',

'common_aidl',

'content_common',

'content_strings_grd',

@@ -450,7 +451,6 @@

'gesture_event_type_java',

'popup_item_type_java',

'result_codes_java',

- 'selection_event_type_java',

'speech_recognition_error_java',

'top_controls_state_java',

'screen_orientation_values_java',

@@ -515,14 +515,6 @@

'includes': [ '../build/android/java_cpp_enum.gypi' ],

{

- 'target_name': 'selection_event_type_java',

- 'type': 'none',

- 'variables': {

- 'source_file': 'browser/renderer_host/input/selection_event_type.h',

- },

- 'includes': [ '../build/android/java_cpp_enum.gypi' ],

- },

- {

'target_name': 'speech_recognition_error_java',

'type': 'none',

'variables': {

« no previous file with comments | « content/browser/web_contents/touch_editable_impl_aura_browsertest.cc ('k') | content/content_browser.gypi » ('j') | ui/base/touch/selection_bound.h » ('J')