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/events | |
| 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/events')
| -rw-r--r-- | views/events/event.h | 1 | ||||
| -rw-r--r-- | views/events/event_x.cc | 17 |
2 files changed, 7 insertions, 11 deletions
diff --git a/views/events/event.h b/views/events/event.h index 2d68e30..4173d53 100644 --- a/views/events/event.h +++ b/views/events/event.h @@ -237,7 +237,6 @@ class MouseEvent : public LocatedEvent { //////////////////////////////////////////////////////////////////////////////// class TouchEvent : public LocatedEvent { public: - explicit TouchEvent(NativeEvent native_event); TouchEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native); // Create a new touch event. diff --git a/views/events/event_x.cc b/views/events/event_x.cc index d3187a2..c008c87 100644 --- a/views/events/event_x.cc +++ b/views/events/event_x.cc @@ -262,10 +262,6 @@ KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native) //////////////////////////////////////////////////////////////////////////////// // MouseEvent, public: -MouseEvent::MouseEvent(NativeEvent native_event) - : LocatedEvent(native_event) { -} - MouseEvent::MouseEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native) : LocatedEvent(native_event_2, from_native) { @@ -276,7 +272,7 @@ MouseEvent::MouseEvent(NativeEvent2 native_event_2, MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native) - : LocatedEvent(native_event_2, from_native), + : MouseEvent(native_event_2, from_native), offset_(GetMouseWheelOffset(native_event_2)) { } @@ -284,11 +280,12 @@ MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2, // TouchEvent, public: #if defined(HAVE_XINPUT2) -TouchEvent::TouchEvent(XEvent* xev) - : LocatedEvent(GetTouchEventType(xev), - GetTouchEventLocation(xev), - GetTouchEventFlags(xev)), - touch_id_(GetTouchIDFromXEvent(xev)) { +TouchEvent::TouchEvent(NativeEvent2 native_event_2, + FromNativeEvent2 from_native) + : LocatedEvent(GetTouchEventType(native_event_2), + GetTouchEventLocation(native_event_2), + GetTouchEventFlags(native_event_2)), + touch_id_(GetTouchIDFromXEvent(native_event_2)) { } #endif |