diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 01:44:56 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 01:44:56 +0000 |
| commit | 522b0c87f78133af346703d63343fb7f8a41d985 (patch) | |
| tree | 100d86fec665309afcc632efa44876b8b7c50125 | |
| parent | 1a2124706a9edab17845a52a34b8123249b1cdae (diff) | |
| download | chromium_src-522b0c87f78133af346703d63343fb7f8a41d985.zip chromium_src-522b0c87f78133af346703d63343fb7f8a41d985.tar.gz chromium_src-522b0c87f78133af346703d63343fb7f8a41d985.tar.bz2 | |
events: Create a separate events component out of ui.
BUG=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/24788002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226105 0039d316-1c4b-4281-b951-d872f2087c98
31 files changed, 175 insertions, 93 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 33be172..62d2c76 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -30,6 +30,7 @@ '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/compositor/compositor.gyp:compositor', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', @@ -669,6 +670,7 @@ '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:aura_test_support', '../ui/compositor/compositor.gyp:compositor', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', @@ -856,6 +858,7 @@ '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/compositor/compositor.gyp:compositor', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', diff --git a/build/filename_rules.gypi b/build/filename_rules.gypi index cf8c357..e7259c6 100644 --- a/build/filename_rules.gypi +++ b/build/filename_rules.gypi @@ -68,6 +68,7 @@ ['exclude', '_(x|x11)(_unittest)?\\.(h|cc)$'], ['exclude', '(^|/)x11_[^/]*\\.(h|cc)$'], ['exclude', '(^|/)x11/'], + ['exclude', '(^|/)x/'], ], }], ['<(toolkit_uses_gtk)!=1 or >(nacl_untrusted_build)==1', { @@ -17,6 +17,7 @@ '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', + '<(DEPTH)/ui/events/events.gyp:events', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/ui.gyp:ui', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 65b14ea..95642f7 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -687,6 +687,7 @@ 'dependencies': [ 'chrome_resources.gyp:chrome_strings', '../base/base.gyp:base', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', ], diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 37cb7cb..ad5fc5d 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -58,6 +58,7 @@ '../third_party/zlib/zlib.gyp:minizip', '../third_party/zlib/zlib.gyp:zlib', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/message_center/message_center.gyp:message_center', '../ui/ui.gyp:shell_dialogs', diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index b5e4d2d..b2e1490 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -43,6 +43,7 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/zlib/zlib.gyp:zlib', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/message_center/message_center.gyp:message_center', '../ui/native_theme/native_theme.gyp:native_theme', diff --git a/chrome/chrome_browser_ui_views.gyp b/chrome/chrome_browser_ui_views.gyp index d135fba..8efd591 100644 --- a/chrome/chrome_browser_ui_views.gyp +++ b/chrome/chrome_browser_ui_views.gyp @@ -10,6 +10,7 @@ 'dependencies': [ '../base/base.gyp:base', '../skia/skia.gyp:skia', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 793c1ac..b135e47 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -489,6 +489,7 @@ '../net/net.gyp:net', '../third_party/zlib/zlib.gyp:minizip', '../third_party/zlib/zlib.gyp:zlib', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', @@ -676,6 +677,7 @@ '../crypto/crypto.gyp:crypto', '../net/net.gyp:http_server', '../net/net.gyp:net', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', ], @@ -777,6 +779,7 @@ '../net/net.gyp:http_server', '../net/net.gyp:net', '../testing/gtest.gyp:gtest', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', ], @@ -800,6 +803,7 @@ '../net/net.gyp:http_server', '../net/net.gyp:net', '../testing/gtest.gyp:gtest', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', ], diff --git a/components/autofill.gypi b/components/autofill.gypi index 996dcd0..985c1bf 100644 --- a/components/autofill.gypi +++ b/components/autofill.gypi @@ -34,6 +34,7 @@ '../content/content.gyp:content_common', '../ipc/ipc.gyp:ipc', '../third_party/WebKit/public/blink.gyp:blink_minimal', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', @@ -111,6 +112,7 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', @@ -299,6 +301,7 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', diff --git a/content/content_app.gypi b/content/content_app.gypi index 127b593..6a419e4 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -10,6 +10,7 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../crypto/crypto.gyp:crypto', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', ], diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 138b10a..6b1738f 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -14,6 +14,7 @@ '../third_party/re2/re2.gyp:re2', '../third_party/zlib/google/zip.gyp:zip', '../third_party/zlib/zlib.gyp:zlib', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/snapshot/snapshot.gyp:snapshot', '../ui/ui.gyp:ui', diff --git a/content/content_shell.gypi b/content/content_shell.gypi index e156484..d83e749 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -47,6 +47,7 @@ '../net/net.gyp:net_resources', '../skia/skia.gyp:skia', '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 57c90ac..afee41c 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -13,6 +13,7 @@ '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:keycode_converter', '../ui/ui.gyp:ui', diff --git a/media/media.gyp b/media/media.gyp index 5815f80..a0d655c 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -49,6 +49,7 @@ '../gpu/gpu.gyp:command_buffer_common', '../skia/skia.gyp:skia', '../third_party/opus/opus.gyp:opus', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 37dfe05..60e0325 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -2433,6 +2433,7 @@ 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', '../net/net.gyp:net', @@ -2737,6 +2738,7 @@ '../ppapi/ppapi.gyp:ppapi_cpp', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/ui.gyp:ui', 'remoting_base', diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index ce7ce2a..9aed9de 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -17,6 +17,7 @@ '../../skia/skia.gyp:skia', '../base/strings/ui_strings.gyp:ui_strings', '../compositor/compositor.gyp:compositor', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index d4d89e4..af6aa7b 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -18,6 +18,7 @@ '../../gpu/gpu.gyp:gpu', '../../skia/skia.gyp:skia', '../compositor/compositor.gyp:compositor', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -125,6 +126,7 @@ 'dependencies': [ '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_test_support', @@ -209,6 +211,7 @@ '../../third_party/icu/icu.gyp:icuuc', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -234,6 +237,7 @@ '../../third_party/icu/icu.gyp:icuuc', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -257,6 +261,7 @@ '../../testing/gtest.gyp:gtest', '../compositor/compositor.gyp:compositor_test_support', '../compositor/compositor.gyp:compositor', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gl/gl.gyp:gl', '../ui.gyp:ui', diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 62d03e3..00c6873 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -16,6 +16,7 @@ '<(DEPTH)/cc/cc.gyp:cc', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', + '<(DEPTH)/ui/events/events.gyp:events', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', @@ -78,6 +79,7 @@ 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/ui/events/events.gyp:events', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', @@ -100,6 +102,7 @@ '<(DEPTH)/cc/cc_tests.gyp:cc_test_utils', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gtest.gyp:gtest', + '<(DEPTH)/ui/events/events.gyp:events', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', diff --git a/ui/base/cocoa/events_mac.mm b/ui/events/cocoa/events_mac.mm index da08510..da08510 100644 --- a/ui/base/cocoa/events_mac.mm +++ b/ui/events/cocoa/events_mac.mm diff --git a/ui/events/events.gyp b/ui/events/events.gyp new file mode 100644 index 0000000..445c41a --- /dev/null +++ b/ui/events/events.gyp @@ -0,0 +1,121 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'chromium_code': 1, + }, + 'targets': [ + { + 'target_name': 'events', + 'type': '<(component)', + 'dependencies': [ + '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '<(DEPTH)/skia/skia.gyp:skia', + '../gfx/gfx.gyp:gfx', + ], + 'defines': [ + 'EVENTS_IMPLEMENTATION', + ], + 'sources': [ + 'cocoa/events_mac.mm', + 'event.cc', + 'event.h', + 'event_constants.h', + 'event_dispatcher.cc', + 'event_dispatcher.h', + 'event_handler.cc', + 'event_handler.h', + 'event_switches.cc', + 'event_switches.h', + 'event_target.cc', + 'event_target.h', + 'event_utils.cc', + 'event_utils.h', + 'events_export.h', + '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_sequence.cc', + 'gestures/gesture_sequence.h', + 'gestures/gesture_types.cc', + 'gestures/gesture_types.h', + 'gestures/gesture_util.cc', + 'gestures/gesture_util.h', + 'gestures/velocity_calculator.cc', + 'gestures/velocity_calculator.h', + 'keycodes/keyboard_code_conversion.cc', + 'keycodes/keyboard_code_conversion.h', + 'keycodes/keyboard_code_conversion_android.cc', + 'keycodes/keyboard_code_conversion_android.h', + 'keycodes/keyboard_code_conversion_gtk.cc', + 'keycodes/keyboard_code_conversion_gtk.h', + 'keycodes/keyboard_code_conversion_mac.h', + 'keycodes/keyboard_code_conversion_mac.mm', + 'keycodes/keyboard_code_conversion_win.cc', + 'keycodes/keyboard_code_conversion_win.h', + 'keycodes/keyboard_code_conversion_x.cc', + 'keycodes/keyboard_code_conversion_x.h', + 'keycodes/keyboard_codes.h', + 'latency_info.cc', + 'latency_info.h', + 'ozone/evdev/key_event_converter_ozone.cc', + 'ozone/evdev/key_event_converter_ozone.h', + 'ozone/evdev/touch_event_converter_ozone.cc', + 'ozone/evdev/touch_event_converter_ozone.h', + 'ozone/event_converter_ozone.cc', + 'ozone/event_converter_ozone.h', + 'ozone/event_factory_delegate_ozone.h', + 'ozone/event_factory_ozone.cc', + 'ozone/event_factory_ozone.h', + 'ozone/events_ozone.cc', + 'win/events_win.cc', + 'x/device_data_manager.cc', + 'x/device_data_manager.h', + 'x/device_list_cache_x.cc', + 'x/device_list_cache_x.h', + 'x/events_x.cc', + 'x/events_x_utils.cc', + 'x/events_x_utils.h', + 'x/touch_factory_x11.cc', + 'x/touch_factory_x11.h', + ], + 'conditions': [ + ['use_aura==0 and toolkit_views==0', { + 'sources/': [ + ['exclude', '^gestures/*'], + ] + }], + ['toolkit_views==0', { + 'sources!': [ + 'event.cc', + 'event.h', + 'event_dispatcher.cc', + 'event_dispatcher.h', + 'event_handler.cc', + 'event_handler.h', + 'event_target.cc', + 'event_target.h', + ], + }], + ['OS=="android"', { + 'sources!': [ + 'event_utils.cc', + 'keycodes/keyboard_code_conversion.cc', + ], + }], + ['use_x11==1', { + 'dependencies': [ + '<(DEPTH)/build/linux/system.gyp:x11', + ], + }], + ], + } + ], +} diff --git a/ui/events/events_export.h b/ui/events/events_export.h index 2439098..65ed7a2 100644 --- a/ui/events/events_export.h +++ b/ui/events/events_export.h @@ -5,12 +5,6 @@ #ifndef UI_EVENTS_EVENTS_EXPORT_H_ #define UI_EVENTS_EVENTS_EXPORT_H_ -// TODO: Remove this block when the dependency of events (i.e. gfx) is its own -// component, and allows events to be its own component. -#if defined(UI_IMPLEMENTATION) -#define EVENTS_IMPLEMENTATION -#endif - #if defined(COMPONENT_BUILD) #if defined(WIN32) diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp index 41605ba..4edb5ef 100644 --- a/ui/keyboard/keyboard.gyp +++ b/ui/keyboard/keyboard.gyp @@ -44,6 +44,7 @@ '../../url/url.gyp:url_lib', '../aura/aura.gyp:aura', '../compositor/compositor.gyp:compositor', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', 'keyboard_resources', diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp index e91e7e5..0d96cb2 100644 --- a/ui/message_center/message_center.gyp +++ b/ui/message_center/message_center.gyp @@ -17,6 +17,7 @@ '../../skia/skia.gyp:skia', '../../url/url.gyp:url_lib', '../base/strings/ui_strings.gyp:ui_strings', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -143,6 +144,7 @@ '../../base/base.gyp:base', '../../base/base.gyp:test_support_base', '../../skia/skia.gyp:skia', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', 'message_center', @@ -162,6 +164,7 @@ '../../base/base.gyp:test_support_base', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:run_ui_unittests', '../ui.gyp:ui', diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp index 6bfcac6..d0a5b1d 100644 --- a/ui/oak/oak.gyp +++ b/ui/oak/oak.gyp @@ -18,6 +18,7 @@ '../../url/url.gyp:url_lib', '../aura/aura.gyp:aura', '../compositor/compositor.gyp:compositor', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp index b96567a..8cc7abf 100644 --- a/ui/snapshot/snapshot.gyp +++ b/ui/snapshot/snapshot.gyp @@ -13,6 +13,7 @@ 'dependencies': [ '../../skia/skia.gyp:skia', '../../base/base.gyp:base', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', ], @@ -50,6 +51,7 @@ '../../base/base.gyp:base', '../../base/base.gyp:test_support_base', '../../testing/gtest.gyp:gtest', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', 'snapshot' diff --git a/ui/surface/surface.gyp b/ui/surface/surface.gyp index 1f310dc..1b3e7e5 100644 --- a/ui/surface/surface.gyp +++ b/ui/surface/surface.gyp @@ -61,6 +61,7 @@ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/ui/events/events.gyp:events', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', @@ -101,6 +102,7 @@ '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gtest.gyp:gtest', + '<(DEPTH)/ui/events/events.gyp:events', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/ui.gyp:ui', 'surface', @@ -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', diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index b096962..c82474b 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -10,6 +10,7 @@ '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', + 'events/events.gyp:events', 'gfx/gfx.gyp:gfx', ], 'sources': [ @@ -83,6 +84,7 @@ '../third_party/libpng/libpng.gyp:libpng', '../url/url.gyp:url_lib', 'base/strings/ui_strings.gyp:ui_strings', + 'events/events.gyp:events', 'keycode_converter', 'run_ui_unittests', 'shell_dialogs', diff --git a/ui/v2/v2.gyp b/ui/v2/v2.gyp index b9183f7..68d1c06 100644 --- a/ui/v2/v2.gyp +++ b/ui/v2/v2.gyp @@ -18,6 +18,7 @@ '../../gpu/gpu.gyp:gpu', '../../skia/skia.gyp:skia', '../compositor/compositor.gyp:compositor', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', diff --git a/ui/views/controls/webview/webview.gyp b/ui/views/controls/webview/webview.gyp index 1977f48..2fde653 100644 --- a/ui/views/controls/webview/webview.gyp +++ b/ui/views/controls/webview/webview.gyp @@ -17,6 +17,7 @@ '../../../../content/content.gyp:content_browser', '../../../../skia/skia.gyp:skia', '../../../../url/url.gyp:url_lib', + '../../../events/events.gyp:events', '../../../gfx/gfx.gyp:gfx', '../../../ui.gyp:ui', '../../../web_dialogs/web_dialogs.gyp:web_dialogs', diff --git a/ui/views/views.gyp b/ui/views/views.gyp index b0b6fbe..626c478 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -30,6 +30,7 @@ '../../url/url.gyp:url_lib', '../base/strings/ui_strings.gyp:ui_strings', '../compositor/compositor.gyp:compositor', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../native_theme/native_theme.gyp:native_theme', '../ui.gyp:ui', @@ -600,6 +601,7 @@ '../../ipc/ipc.gyp:test_support_ipc', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', 'views', @@ -654,6 +656,7 @@ '../../ipc/ipc.gyp:test_support_ipc', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', 'controls/webview/webview.gyp:webview', @@ -688,6 +691,7 @@ '../base/strings/ui_strings.gyp:ui_strings', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -832,6 +836,7 @@ '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -925,6 +930,7 @@ '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', '../../url/url.gyp:url_lib', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -1015,6 +1021,7 @@ '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', + '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../ui.gyp:ui', '../ui.gyp:ui_resources', |