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/widget/widget.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/widget/widget.h')
| -rw-r--r-- | views/widget/widget.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/views/widget/widget.h b/views/widget/widget.h index 07096ae..86d62ee 100644 --- a/views/widget/widget.h +++ b/views/widget/widget.h @@ -43,9 +43,7 @@ class Accelerator; class Compositor; class OSExchangeData; class ThemeProvider; -#if defined(TOUCH_UI) enum TouchStatus; -#endif } using ui::ThemeProvider; @@ -525,9 +523,7 @@ class Widget : public internal::NativeWidgetDelegate, virtual bool OnKeyEvent(const KeyEvent& event) OVERRIDE; virtual bool OnMouseEvent(const MouseEvent& event) OVERRIDE; virtual void OnMouseCaptureLost() OVERRIDE; -#if defined(TOUCH_UI) virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE; -#endif virtual bool ExecuteCommand(int command_id) OVERRIDE; virtual Widget* AsWidget() OVERRIDE; virtual const Widget* AsWidget() const OVERRIDE; |