From 2dca2dc97fd303df0c6a1fb11828472ef1c00428 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Tue, 20 Nov 2012 17:13:08 +0000 Subject: ui: Add default implementations for EventHandler interface. This allows getting rid of a whole bunch of noop implementations, and makes it easier to add new event types to be dispatched through the EventDispatcher to EventHandlers. BUG=159632 Review URL: https://codereview.chromium.org/11348145 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168817 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/tooltips/tooltip_controller.cc | 8 -------- ash/tooltips/tooltip_controller.h | 2 -- 2 files changed, 10 deletions(-) (limited to 'ash/tooltips') diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index aa19e31..c13bcdd 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -300,10 +300,6 @@ ui::EventResult TooltipController::OnMouseEvent(ui::MouseEvent* event) { return ui::ER_UNHANDLED; } -ui::EventResult TooltipController::OnScrollEvent(ui::ScrollEvent* event) { - return ui::ER_UNHANDLED; -} - ui::EventResult TooltipController::OnTouchEvent(ui::TouchEvent* event) { // TODO(varunjain): need to properly implement tooltips for // touch events. @@ -316,10 +312,6 @@ ui::EventResult TooltipController::OnTouchEvent(ui::TouchEvent* event) { return ui::ER_UNHANDLED; } -ui::EventResult TooltipController::OnGestureEvent(ui::GestureEvent* event) { - return ui::ER_UNHANDLED; -} - 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 dba89d2..67c6f77 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -44,9 +44,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient, // Overridden from ui::EventHandler. virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; // Overridden from aura::WindowObserver. virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; -- cgit v1.1