diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 14:15:21 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 14:15:21 +0000 |
| commit | b096ce14f3a2bd6c9d1003b3cb0a68929515cda7 (patch) | |
| tree | e16698efc0a64a55a9f5ca176792d0dbf9bacecb /views/focus | |
| parent | 4ae84c931861762184bdbeea7532560b3ed527e4 (diff) | |
| download | chromium_src-b096ce14f3a2bd6c9d1003b3cb0a68929515cda7.zip chromium_src-b096ce14f3a2bd6c9d1003b3cb0a68929515cda7.tar.gz chromium_src-b096ce14f3a2bd6c9d1003b3cb0a68929515cda7.tar.bz2 | |
touch: Fix compile for the new MouseEvent ctors (r77221).
BUG=none
TEST=touch compiles
TBR=msw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus')
| -rw-r--r-- | views/focus/accelerator_handler_touch.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index 0e163e5..ce15c51 100644 --- a/views/focus/accelerator_handler_touch.cc +++ b/views/focus/accelerator_handler_touch.cc @@ -73,7 +73,8 @@ bool DispatchX2Event(RootView* root, XEvent* xev) { // Create a TouchEvent, and send it off to |root|. If the event // is processed by |root|, then return. Otherwise let it fall through so it // can be used (if desired) as a mouse event. - TouchEvent touch(xev); + Event::FromNativeEvent2 from_native; + TouchEvent touch(xev, from_native); if (root->OnTouchEvent(touch) != views::View::TOUCH_STATUS_UNKNOWN) return true; } @@ -96,7 +97,8 @@ bool DispatchX2Event(RootView* root, XEvent* xev) { return root->OnMouseWheel(wheelev); } - MouseEvent mouseev(xev); + Event::FromNativeEvent2 from_native; + MouseEvent mouseev(xev, from_native); if (!touch_event) { // Show the cursor, and decide whether or not the cursor should be // automatically hidden after a certain time of inactivity. @@ -178,7 +180,8 @@ bool DispatchXEvent(XEvent* xev) { MouseWheelEvent wheelev(xev, from_native); return root->OnMouseWheel(wheelev); } else { - MouseEvent mouseev(xev); + Event::FromNativeEvent2 from_native; + MouseEvent mouseev(xev, from_native); if (xev->type == ButtonPress) { return root->OnMousePressed(mouseev); } else { @@ -190,7 +193,8 @@ bool DispatchXEvent(XEvent* xev) { } case MotionNotify: { - MouseEvent mouseev(xev); + Event::FromNativeEvent2 from_native; + MouseEvent mouseev(xev, from_native); if (mouseev.type() == ui::ET_MOUSE_DRAGGED) { return root->OnMouseDragged(mouseev); } else { |