diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:06:35 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:06:35 +0000 |
commit | 5951806fdc9a6d3063014b0479307dba66767f97 (patch) | |
tree | 1b52d819db6119600bcaeab8f51ccc3a3d48c925 /views/widget | |
parent | b5ad6bd0e8eda70dc4f3b1dbd6229f9d82cdb17b (diff) | |
download | chromium_src-5951806fdc9a6d3063014b0479307dba66767f97.zip chromium_src-5951806fdc9a6d3063014b0479307dba66767f97.tar.gz chromium_src-5951806fdc9a6d3063014b0479307dba66767f97.tar.bz2 |
aura: Add support for touch events.
Among the changes:
. Add touch event handling in EventFilter. Be default, activates a window on TOUCH_START (like for MOUSE_PRESSED).
. Move TouchEvent details functions into ui/. Moved the X11 implementations from views/ to ui/. NOTIMPLEMENTED on windows.
. Disable RWHVAura et. al. for touchui for now (they are still compiled in, but not used).
BUG=100269
TEST=none
Review URL: http://codereview.chromium.org/8274025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
-rw-r--r-- | views/widget/native_widget_aura.cc | 8 | ||||
-rw-r--r-- | views/widget/native_widget_aura.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc index 1158e7b..18c82cd 100644 --- a/views/widget/native_widget_aura.cc +++ b/views/widget/native_widget_aura.cc @@ -521,7 +521,13 @@ bool NativeWidgetAura::OnMouseEvent(aura::MouseEvent* event) { return delegate_->OnMouseEvent(mouse_event); } -bool NativeWidgetAura::ShouldActivate(aura::MouseEvent* event) { +ui::TouchStatus NativeWidgetAura::OnTouchEvent(aura::TouchEvent* event) { + DCHECK(window_->IsVisible()); + TouchEvent touch_event(event); + return delegate_->OnTouchEvent(touch_event); +} + +bool NativeWidgetAura::ShouldActivate(aura::Event* event) { return can_activate_; } diff --git a/views/widget/native_widget_aura.h b/views/widget/native_widget_aura.h index a21637b..9ba5f86 100644 --- a/views/widget/native_widget_aura.h +++ b/views/widget/native_widget_aura.h @@ -9,6 +9,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "ui/aura/window_delegate.h" +#include "ui/base/events.h" #include "views/views_export.h" #include "views/widget/native_widget_private.h" @@ -131,7 +132,8 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; - virtual bool ShouldActivate(aura::MouseEvent* event) OVERRIDE; + virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; + virtual bool ShouldActivate(aura::Event* event) OVERRIDE; virtual void OnActivated() OVERRIDE; virtual void OnLostActive() OVERRIDE; virtual void OnCaptureLost() OVERRIDE; |