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

Unified Diff: ui/events/BUILD.gn

Issue 305993002: Update skia and ui GN builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gesture detection updates Created 6 years, 7 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
« no previous file with comments | « ui/base/BUILD.gn ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/BUILD.gn
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index d5ce1dbada4d51a68ae41d5afe9f3e0ebe988a7d..1aae11ff16368397dc73676aabea7e83038cf0fd 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -22,6 +22,8 @@ component("events_base") {
"events_base_export.h",
"gesture_event_details.cc",
"gesture_event_details.h",
+ "gestures/gesture_configuration.cc",
+ "gestures/gesture_configuration.h",
"keycodes/keyboard_code_conversion.cc",
"keycodes/keyboard_code_conversion.h",
"keycodes/keyboard_code_conversion_android.cc",
@@ -66,6 +68,7 @@ component("events") {
deps = [
":dom4_keycode_converter",
":events_base",
+ ":gesture_detection",
"//skia",
"//ui/gfx",
"//ui/gfx/geometry",
@@ -96,13 +99,12 @@ component("events") {
"event_utils.h",
"events_export.h",
"events_stub.cc",
- "gestures/gesture_configuration.cc",
- "gestures/gesture_configuration.h",
"gestures/gesture_point.cc",
"gestures/gesture_point.h",
"gestures/gesture_recognizer.h",
"gestures/gesture_recognizer_impl.cc",
"gestures/gesture_recognizer_impl.h",
+ "gestures/gesture_recognizer_impl_mac.cc",
"gestures/gesture_sequence.cc",
"gestures/gesture_sequence.h",
"gestures/gesture_types.h",
@@ -168,6 +170,15 @@ component("events") {
]
}
+ if (use_aura) {
+ sources += [
+ "gestures/gesture_provider_aura.cc",
+ "gestures/gesture_provider_aura.h",
+ "gestures/motion_event_aura.cc",
+ "gestures/motion_event_aura.h",
+ ]
+ }
+
if (is_win || use_x11 || use_ozone) {
sources -= [ "events_stub.cc" ]
}
@@ -210,10 +221,6 @@ component("gesture_detection") {
defines = [ "GESTURE_DETECTION_IMPLEMENTATION" ]
- if (use_aura) {
- deps += [ ":events" ]
- }
-
if (is_android) {
sources += [ "gesture_detection/gesture_config_helper_android.cc" ]
} else if (use_aura) {
« no previous file with comments | « ui/base/BUILD.gn ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698