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

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: Excluded ui/touch_selection from Windows GN build Created 6 years 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') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index cb10121903635107f4c4474e6422ea9ec42f06f5..25b43e1c615d2f3ca64244ab480b6e0989ca02de 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -444,6 +444,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',
@@ -451,7 +452,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',
@@ -509,14 +509,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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698