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

Unified Diff: ui/touch_selection/BUILD.gn

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/BUILD.gn
diff --git a/ui/touch_selection/BUILD.gn b/ui/touch_selection/BUILD.gn
index ede552f9d3181d968df5d56f350308e86604fbf8..5b93ebf42971ac886eabcd2b05f03c907d68ae10 100644
--- a/ui/touch_selection/BUILD.gn
+++ b/ui/touch_selection/BUILD.gn
@@ -16,9 +16,15 @@ component("touch_selection") {
"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",
]
@@ -26,29 +32,57 @@ component("touch_selection") {
deps = [
"//base:base",
+ "//ui/aura:aura",
+ "//ui/aura_extra:aura_extra",
"//ui/base:base",
+ "//ui/compositor:compositor",
"//ui/events:events",
"//ui/events:gesture_detection",
+ "//ui/gfx:gfx",
"//ui/gfx/geometry:geometry",
]
+
+ if (!use_aura) {
+ deps -= [
+ "//ui/aura:aura",
+ "//ui/aura_extra:aura_extra",
+ "//ui/compositor:compositor",
+ "//ui/gfx: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",
+ ]
+ }
}
test("ui_touch_selection_unittests") {
sources = [
+ "run_all_unittests.cc",
"touch_handle_unittest.cc",
+ "touch_selection_controller_aura_unittest.cc",
"touch_selection_controller_unittest.cc",
]
deps = [
":touch_selection",
- "//base/test:run_all_unittests",
"//testing/gmock:gmock",
"//testing/gtest:gtest",
+ "//ui/aura:test_support",
"//ui/base:base",
"//ui/events:test_support",
"//ui/gfx:gfx",
"//ui/gfx:test_support",
]
+
+ if (!use_aura) {
+ deps -= [ "//ui/aura:test_support" ]
+ sources -= [ "touch_selection_controller_aura_unittest.cc" ]
+ }
}
if (is_android) {

Powered by Google App Engine
This is Rietveld 408576698