diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 22:04:44 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 22:04:44 +0000 |
| commit | a3e2de75e309b527cd694b16d23100bbec1710d9 (patch) | |
| tree | 30f49027fbf74758595ee30b0b301206a4c2becf /views/views.gyp | |
| parent | e30e4d816f7e32f2be39f32159e020d3b037de04 (diff) | |
| download | chromium_src-a3e2de75e309b527cd694b16d23100bbec1710d9.zip chromium_src-a3e2de75e309b527cd694b16d23100bbec1710d9.tar.gz chromium_src-a3e2de75e309b527cd694b16d23100bbec1710d9.tar.bz2 | |
Consolidate/cleanup event cracking code; single out GdkEvents; saves ~850 lines.
Move ui::NativeEvent typdefs and common functions to ui/base/events.h.
Remove NativeEvent2 typedef, single out GdkEvent* uses that should be removed.
Implement platform specific ui/base/[platform]/events_[platform].cc.
Revise views::NativeEvent definitions (to support Aura abstraction).
Consolidate Event[Type/Flags/Location]FromNative(), GetMouseWheelOffset(), etc.
Remove GetRepeatCount(), GetWindowsFlags(), IsExtendedKey(), etc.
Add IsMouseEvent(), KeyboardCodeFromNative(), EF_EXTENDED flag, etc.
Localize GetFlagsFromGdkEvent(), move some file locals to new helpers files.
Move views/touchui/touch_factory.h|cc to ui/base/touch.
Stop mixing Windows mouse events' MK_*BUTTON into their wParams.
BUG=93945
TEST=No build breaks (many configs...), no mouse/key behavior changes.
Review URL: http://codereview.chromium.org/7942004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/views/views.gyp b/views/views.gyp index 3d5e995..3c0ade1 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -13,7 +13,6 @@ ['include', '_(win)\\.cc$'], ['include', '/win/'], ['include', '/win_[^/]*\\.cc$'], - ['exclude', 'touchui/touch_factory.cc'], ]}], ['touchui==0', { 'sources/': [ @@ -260,8 +259,6 @@ 'events/event_gtk.cc', 'events/event_wayland.cc', 'events/event_win.cc', - 'events/event_utils_win.cc', - 'events/event_utils_win.h', 'events/event_x.cc', 'focus/accelerator_handler.h', 'focus/accelerator_handler_aura.cc', @@ -332,8 +329,6 @@ 'repeat_controller.h', 'touchui/gesture_manager.cc', 'touchui/gesture_manager.h', - 'touchui/touch_factory.cc', - 'touchui/touch_factory.h', 'touchui/touch_selection_controller.cc', 'touchui/touch_selection_controller.h', 'touchui/touch_selection_controller_impl.cc', @@ -426,8 +421,6 @@ ['exclude', '_(gtk|x)\\.cc$'], ['exclude', '/(gtk|x)_[^/]*\\.cc$'], ['exclude', 'focus/accelerator_handler_touch.cc'], - ['exclude', 'touchui/touch_factory.cc'], - ['exclude', 'touchui/touch_factory.h'], ['include', 'controls/menu/native_menu_views.cc'], ['include', 'controls/menu/native_menu_views.h'], ['include', 'drag_utils_gtk.cc'], @@ -542,6 +535,11 @@ '<(DEPTH)/third_party/wtl/include', ], }], + ['use_x11==0', { + 'sources!': [ + 'events/event_x.cc', + ], + }], ], }, { |