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

Unified Diff: ui/touch_selection/ui_touch_selection.gyp

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: Rebased after addition of touch_handle_orientation file Created 5 years, 10 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
Index: ui/touch_selection/ui_touch_selection.gyp
diff --git a/ui/touch_selection/ui_touch_selection.gyp b/ui/touch_selection/ui_touch_selection.gyp
index 851c26f49a4ce13eda4a1cd576348bd8d7ca110a..bf4f82c8a15ab49a07a698d99be5d7f42843c98b 100644
--- a/ui/touch_selection/ui_touch_selection.gyp
+++ b/ui/touch_selection/ui_touch_selection.gyp
@@ -12,9 +12,13 @@
'type': '<(component)',
'dependencies': [
'../../base/base.gyp:base',
+ '../aura/aura.gyp:aura',
+ '../aura_extra/aura_extra.gyp:aura_extra',
'../base/ui_base.gyp:ui_base',
+ '../compositor/compositor.gyp:compositor',
'../events/events.gyp:events',
'../events/events.gyp:gesture_detection',
+ '../gfx/gfx.gyp:gfx',
'../gfx/gfx.gyp:gfx_geometry',
],
'defines': [
@@ -24,32 +28,59 @@
'selection_event_type.h',
'touch_handle.cc',
'touch_handle.h',
+ 'touch_handle_drawable_aura.cc',
+ 'touch_handle_drawable_aura.h',
'touch_handle_orientation.h',
'touch_selection_controller.cc',
'touch_selection_controller.h',
+ 'touch_selection_controller_aura.cc',
+ 'touch_selection_controller_aura.h',
+ 'touch_selection_menu_runner.cc',
+ 'touch_selection_menu_runner.h',
'ui_touch_selection_export.h',
],
'include_dirs': [
'../..',
],
+ 'conditions': [
+ ['use_aura==0', {
+ 'dependencies!': [
+ '../aura/aura.gyp:aura',
+ '../aura_extra/aura_extra.gyp:aura_extra',
+ '../compositor/compositor.gyp:compositor',
+ '../gfx/gfx.gyp:gfx',
+ ],
+ 'sources!': [
+ 'touch_handle_drawable_aura.cc',
+ 'touch_handle_drawable_aura.h',
+ 'touch_selection_controller_aura.cc',
+ 'touch_selection_controller_aura.h',
+ 'touch_selection_menu_runner.cc',
+ 'touch_selection_menu_runner.h',
+ ],
+ }],
+ ],
},
{
'target_name': 'ui_touch_selection_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
'../../base/base.gyp:base',
- '../../base/base.gyp:run_all_unittests',
'../../base/base.gyp:test_support_base',
'../../testing/gmock.gyp:gmock',
'../../testing/gtest.gyp:gtest',
+ '../aura/aura.gyp:aura_test_support',
'../base/ui_base.gyp:ui_base',
'../events/events.gyp:events_test_support',
'../gfx/gfx.gyp:gfx',
'../gfx/gfx.gyp:gfx_test_support',
+ '../gl/gl.gyp:gl',
'ui_touch_selection',
],
'sources': [
+ 'run_all_unittests.cc',
'touch_handle_unittest.cc',
+ 'touch_selection_controller_aura_unittest.cc',
'touch_selection_controller_unittest.cc',
],
'include_dirs': [
@@ -61,6 +92,14 @@
'../../testing/android/native_test.gyp:native_test_native_code',
],
}],
+ ['use_aura==0', {
+ 'dependencies!': [
+ '../aura/aura.gyp:aura_test_support',
+ ],
+ 'sources!': [
+ 'touch_selection_controller_aura_unittest.cc',
+ ]
+ }],
]
},
],

Powered by Google App Engine
This is Rietveld 408576698