diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 14:24:05 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 14:24:05 +0000 |
| commit | dc4ffc998b3a4f95e8e607f7cd372f6202684640 (patch) | |
| tree | 2fc2af4130e094e574fa342855e8d949fcc21c0f /views/events/event.h | |
| parent | 5997ae3fd9caf9e9f11b364b476c69e2803b6ba2 (diff) | |
| download | chromium_src-dc4ffc998b3a4f95e8e607f7cd372f6202684640.zip chromium_src-dc4ffc998b3a4f95e8e607f7cd372f6202684640.tar.gz chromium_src-dc4ffc998b3a4f95e8e607f7cd372f6202684640.tar.bz2 | |
Remove ifdef's for touchui stuff from events code.
Also, make sure the touch_pressed_handler_ is the view being removed before resetting it to NULL.
BUG=none
TEST=things compile and existing tests continue to pass
Review URL: http://codereview.chromium.org/7276002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/events/event.h')
| -rw-r--r-- | views/events/event.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/views/events/event.h b/views/events/event.h index 531b506..03eec99 100644 --- a/views/events/event.h +++ b/views/events/event.h @@ -13,7 +13,7 @@ #include "ui/gfx/point.h" #include "views/native_types.h" -#if defined(TOUCH_UI) +#if defined(USE_X11) typedef union _XEvent XEvent; #endif @@ -79,7 +79,6 @@ class Event { type_ == ui::ET_MOUSEWHEEL; } -#if defined(TOUCH_UI) bool IsTouchEvent() const { return type_ == ui::ET_TOUCH_RELEASED || type_ == ui::ET_TOUCH_PRESSED || @@ -87,7 +86,6 @@ class Event { type_ == ui::ET_TOUCH_STATIONARY || type_ == ui::ET_TOUCH_CANCELLED; } -#endif #if defined(OS_WIN) // Returns the EventFlags in terms of windows flags. @@ -165,9 +163,7 @@ class LocatedEvent : public Event { gfx::Point location_; }; -#if defined(TOUCH_UI) class TouchEvent; -#endif //////////////////////////////////////////////////////////////////////////////// // @@ -186,14 +182,12 @@ class MouseEvent : public LocatedEvent { // from |source| coordinate system to |target| coordinate system. MouseEvent(const MouseEvent& model, View* source, View* target); -#if defined(TOUCH_UI) // Creates a new MouseEvent from a TouchEvent. The location of the TouchEvent // is the same as the MouseEvent. Other attributes (e.g. type, flags) are // mapped from the TouchEvent to appropriate MouseEvent attributes. // GestureManager uses this to convert TouchEvents that are not handled by any // view. MouseEvent(const TouchEvent& touch, FromNativeEvent2 from_native); -#endif // TODO(msw): Kill this legacy constructor when we update uses. // Create a new mouse event @@ -241,7 +235,6 @@ class MouseEvent : public LocatedEvent { DISALLOW_COPY_AND_ASSIGN(MouseEvent); }; -#if defined(TOUCH_UI) //////////////////////////////////////////////////////////////////////////////// // // TouchEvent class @@ -301,7 +294,6 @@ class TouchEvent : public LocatedEvent { DISALLOW_COPY_AND_ASSIGN(TouchEvent); }; -#endif //////////////////////////////////////////////////////////////////////////////// // KeyEvent class |