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 /ui | |
| 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 'ui')
| -rw-r--r-- | ui/base/events.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/base/events.h b/ui/base/events.h index 37791a5..d3a4828 100644 --- a/ui/base/events.h +++ b/ui/base/events.h @@ -20,13 +20,11 @@ enum EventType { ET_KEY_PRESSED, ET_KEY_RELEASED, ET_MOUSEWHEEL, -#if defined(TOUCH_UI) ET_TOUCH_RELEASED, ET_TOUCH_PRESSED, ET_TOUCH_MOVED, ET_TOUCH_STATIONARY, ET_TOUCH_CANCELLED, -#endif ET_DROP_TARGET_EVENT }; @@ -51,7 +49,6 @@ enum MouseEventFlags { EF_IS_NON_CLIENT = 1 << 17 }; -#if defined(TOUCH_UI) enum TouchStatus { TOUCH_STATUS_UNKNOWN = 0, // Unknown touch status. This is used to indicate // that the touch event was not handled. @@ -65,7 +62,6 @@ enum TouchStatus { // synthetic mouse event generated from the // unused touch event was handled. }; -#endif } // namespace ui |