diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 17:46:04 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 17:46:04 +0000 |
| commit | 538f956734244278d1d82e959bfd2a54a5537cd5 (patch) | |
| tree | 2bfaaa4aa666e696af9ebab5b4871e8b55004480 /ash/tooltips | |
| parent | 04bdebfa5c0a7aee88220c20b3b8d483f79a3d12 (diff) | |
| download | chromium_src-538f956734244278d1d82e959bfd2a54a5537cd5.zip chromium_src-538f956734244278d1d82e959bfd2a54a5537cd5.tar.gz chromium_src-538f956734244278d1d82e959bfd2a54a5537cd5.tar.bz2 | |
aura: Gesture event plumbing (skeleton).
Add gesture event plumbing through aura. This is not functional just yet.
Subsequent CLs will move the gesture-recognizer from views into aura,
which will then generate and deliver aura gesture events.
BUG=11024
TEST=no functional changes yet. Tests will be added when GR is moved into aura.
Review URL: https://chromiumcodereview.appspot.com/9221014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 6 | ||||
| -rw-r--r-- | ash/tooltips/tooltip_controller.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 9c77d2d..f6cd200 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -270,6 +270,12 @@ ui::TouchStatus TooltipController::PreHandleTouchEvent( return ui::TOUCH_STATUS_UNKNOWN; } +ui::GestureStatus TooltipController::PreHandleGestureEvent( + aura::Window* target, + aura::GestureEvent* event) { + return ui::GESTURE_STATUS_UNKNOWN; +} + void TooltipController::OnWindowDestroyed(aura::Window* window) { if (tooltip_window_ == window) { tooltip_window_->RemoveObserver(this); diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h index 2246ad5..2e38895 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -48,6 +48,8 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient, aura::MouseEvent* event) OVERRIDE; virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, aura::TouchEvent* event) OVERRIDE; + virtual ui::GestureStatus PreHandleGestureEvent(aura::Window* target, + aura::GestureEvent* event) OVERRIDE; // Overridden from aura::WindowObserver. virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; |