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 /ui/ui.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 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -16,10 +16,6 @@ ['exclude', 'views/'], ]}], ['touchui==0', {'sources/': [ - ['exclude', 'event_x.cc$'], - ['exclude', 'native_menu_x.cc$'], - ['exclude', 'native_menu_x.h$'], - ['exclude', 'touchui/'], ['exclude', '_(touch)\\.cc$'], ]}], ], @@ -189,6 +185,8 @@ 'base/text/text_elider.h', 'base/theme_provider.cc', 'base/theme_provider.h', + 'base/touch/touch_factory.cc', + 'base/touch/touch_factory.h', 'base/ui_base_exports.cc', 'base/ui_base_paths.cc', 'base/ui_base_paths.h', @@ -198,6 +196,8 @@ 'base/ui_export.h', 'base/view_prop.cc', 'base/view_prop.h', + 'base/wayland/events_wayland.cc', + 'base/win/events_win.cc', 'base/win/hwnd_util.cc', 'base/win/hwnd_util.h', 'base/win/ime_input.cc', @@ -210,6 +210,7 @@ 'base/win/window_impl.h', 'base/x/active_window_watcher_x.cc', 'base/x/active_window_watcher_x.h', + 'base/x/events_x.cc', 'base/x/x11_util.cc', 'base/x/x11_util.h', 'base/x/x11_util_internal.h', @@ -409,6 +410,8 @@ ], 'sources!': [ 'base/clipboard/clipboard_aura.cc', + 'base/touch/touch_factory.cc', + 'base/touch/touch_factory.h', 'gfx/pango_util.h', 'gfx/pango_util.cc', 'gfx/platform_font_pango.cc', @@ -454,6 +457,8 @@ }], ['OS=="mac"', { 'sources!': [ + 'base/touch/touch_factory.cc', + 'base/touch/touch_factory.h', 'gfx/pango_util.h', 'gfx/pango_util.cc', 'gfx/platform_font_pango.h', @@ -482,6 +487,12 @@ 'sources!': [ 'base/keycodes/keyboard_code_conversion_x.cc', 'base/keycodes/keyboard_code_conversion_x.h', + 'base/x/active_window_watcher_x.cc', + 'base/x/active_window_watcher_x.h', + 'base/x/events_x.cc', + 'base/x/x11_util.cc', + 'base/x/x11_util.h', + 'base/x/x11_util_internal.h', ], }], ['chromeos==1', { |