diff options
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; |