Index: ui/ui.gyp |
diff --git a/ui/ui.gyp b/ui/ui.gyp |
index ce767ace099cd938bbd9f54638108c2b1097bbea..e9d889fa215aad14b32adb8b2933c93153cf2171 100644 |
--- a/ui/ui.gyp |
+++ b/ui/ui.gyp |
@@ -28,6 +28,7 @@ |
'../third_party/zlib/zlib.gyp:zlib', |
'../url/url.gyp:url_lib', |
'base/strings/ui_strings.gyp:ui_strings', |
+ 'events/events.gyp:events', |
'gfx/gfx.gyp:gfx', |
'ui_resources', |
], |
@@ -39,6 +40,7 @@ |
'../net/net.gyp:net', |
'../third_party/icu/icu.gyp:icui18n', |
'../third_party/icu/icu.gyp:icuuc', |
+ 'events/events.gyp:events', |
'gfx/gfx.gyp:gfx', |
], |
'sources' : [ |
@@ -97,7 +99,6 @@ |
'base/cocoa/controls/hover_image_menu_button_cell.mm', |
'base/cocoa/controls/hyperlink_button_cell.h', |
'base/cocoa/controls/hyperlink_button_cell.mm', |
- 'base/cocoa/events_mac.mm', |
'base/cocoa/find_pasteboard.h', |
'base/cocoa/find_pasteboard.mm', |
'base/cocoa/flipped_view.h', |
@@ -167,21 +168,6 @@ |
'base/dragdrop/os_exchange_data_provider_aura.h', |
'base/dragdrop/os_exchange_data_provider_win.cc', |
'base/dragdrop/os_exchange_data_provider_win.h', |
- 'events/gestures/gesture_configuration.cc', |
- 'events/gestures/gesture_configuration.h', |
- 'events/gestures/gesture_point.cc', |
- 'events/gestures/gesture_point.h', |
- 'events/gestures/gesture_recognizer.h', |
- 'events/gestures/gesture_recognizer_impl.cc', |
- 'events/gestures/gesture_recognizer_impl.h', |
- 'events/gestures/gesture_sequence.cc', |
- 'events/gestures/gesture_sequence.h', |
- 'events/gestures/gesture_types.cc', |
- 'events/gestures/gesture_types.h', |
- 'events/gestures/gesture_util.cc', |
- 'events/gestures/gesture_util.h', |
- 'events/gestures/velocity_calculator.cc', |
- 'events/gestures/velocity_calculator.h', |
'base/gtk/event_synthesis_gtk.cc', |
'base/gtk/event_synthesis_gtk.h', |
'base/gtk/focus_store_gtk.cc', |
@@ -331,55 +317,6 @@ |
'base/x/x11_util.cc', |
'base/x/x11_util.h', |
'base/x/x11_util_internal.h', |
- 'events/event.cc', |
- 'events/event.h', |
- 'events/event_constants.h', |
- 'events/event_dispatcher.cc', |
- 'events/event_dispatcher.h', |
- 'events/event_handler.cc', |
- 'events/event_handler.h', |
- 'events/event_switches.cc', |
- 'events/event_switches.h', |
- 'events/event_target.cc', |
- 'events/event_target.h', |
- 'events/event_utils.cc', |
- 'events/event_utils.h', |
- 'events/events_export.h', |
- 'events/keycodes/keyboard_code_conversion.cc', |
- 'events/keycodes/keyboard_code_conversion.h', |
- 'events/keycodes/keyboard_code_conversion_android.cc', |
- 'events/keycodes/keyboard_code_conversion_android.h', |
- 'events/keycodes/keyboard_code_conversion_gtk.cc', |
- 'events/keycodes/keyboard_code_conversion_gtk.h', |
- 'events/keycodes/keyboard_code_conversion_mac.h', |
- 'events/keycodes/keyboard_code_conversion_mac.mm', |
- 'events/keycodes/keyboard_code_conversion_win.cc', |
- 'events/keycodes/keyboard_code_conversion_win.h', |
- 'events/keycodes/keyboard_code_conversion_x.cc', |
- 'events/keycodes/keyboard_code_conversion_x.h', |
- 'events/keycodes/keyboard_codes.h', |
- 'events/latency_info.cc', |
- 'events/latency_info.h', |
- 'events/ozone/evdev/key_event_converter_ozone.cc', |
- 'events/ozone/evdev/key_event_converter_ozone.h', |
- 'events/ozone/evdev/touch_event_converter_ozone.cc', |
- 'events/ozone/evdev/touch_event_converter_ozone.h', |
- 'events/ozone/event_converter_ozone.cc', |
- 'events/ozone/event_converter_ozone.h', |
- 'events/ozone/event_factory_delegate_ozone.h', |
- 'events/ozone/event_factory_ozone.cc', |
- 'events/ozone/event_factory_ozone.h', |
- 'events/ozone/events_ozone.cc', |
- 'events/win/events_win.cc', |
- 'events/x/device_data_manager.cc', |
- 'events/x/device_data_manager.h', |
- 'events/x/device_list_cache_x.cc', |
- 'events/x/device_list_cache_x.h', |
- 'events/x/events_x.cc', |
- 'events/x/events_x_utils.cc', |
- 'events/x/events_x_utils.h', |
- 'events/x/touch_factory_x11.cc', |
- 'events/x/touch_factory_x11.h', |
'webui/jstemplate_builder.cc', |
'webui/jstemplate_builder.h', |
'webui/web_ui_util.cc', |
@@ -451,11 +388,6 @@ |
['exclude', 'base/dragdrop/drag_utils_aura.cc'], |
], |
}], |
- ['use_aura==0 and toolkit_views==0', { |
- 'sources/': [ |
- ['exclude', '^events/gestures/*'], |
- ] |
- }], |
['use_glib == 1', { |
'dependencies': [ |
# font_gtk.cc uses fontconfig. |
@@ -589,12 +521,6 @@ |
'../build/linux/system.gyp:xext', |
'../build/linux/system.gyp:xfixes', |
], |
- }, { # use_x11==0 |
- 'sources/': [ |
- ['exclude', 'events/keycodes/keyboard_code_conversion_x.*'], |
- ['exclude', 'base/x/*'], |
- ['exclude', 'events/x/*'], |
- ], |
}], |
['use_ozone==0', { |
'sources!': [ |
@@ -607,15 +533,6 @@ |
'sources!': [ |
'base/dragdrop/drop_target_event.cc', |
'base/dragdrop/drop_target_event.h', |
- 'events/event.cc', |
- 'events/event.h', |
- 'events/event_dispatcher.cc', |
- 'events/event_dispatcher.h', |
- 'events/event_handler.cc', |
- 'events/event_handler.h', |
- 'events/event_target.cc', |
- 'events/event_target.h', |
- 'events/x/events_x.cc', |
], |
}], |
['OS=="android"', { |
@@ -625,8 +542,6 @@ |
'base/default_theme_provider.cc', |
'base/dragdrop/drag_utils.cc', |
'base/dragdrop/drag_utils.h', |
- 'events/event_utils.cc', |
- 'events/keycodes/keyboard_code_conversion.cc', |
'base/l10n/l10n_font_util.cc', |
'base/models/button_menu_item_model.cc', |
'base/models/dialog_model.cc', |