summaryrefslogtreecommitdiffstats
path: root/views/controls/menu
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 22:04:44 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 22:04:44 +0000
commita3e2de75e309b527cd694b16d23100bbec1710d9 (patch)
tree30f49027fbf74758595ee30b0b301206a4c2becf /views/controls/menu
parente30e4d816f7e32f2be39f32159e020d3b037de04 (diff)
downloadchromium_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/controls/menu')
-rw-r--r--views/controls/menu/menu_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 1255610..8d94a02 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -1826,7 +1826,7 @@ void MenuController::RepostEvent(SubmenuView* source,
if (event_type) {
if (in_client_area) {
- PostMessage(window, event_type, event.GetWindowsFlags(),
+ PostMessage(window, event_type, event.native_event().wParam,
MAKELPARAM(window_x, window_y));
} else {
PostMessage(window, event_type, nc_hit_result,