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
marcosholgado · Nov 20, 2012 · 2dca2dc · 2dca2dc
1 parent 06ad578
commit 2dca2dc
Show file tree

Hide file tree

Showing 51 changed files with 45 additions and 470 deletions.
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc
@@ -90,21 +90,5 @@ ui::EventResult AcceleratorFilter::OnKeyEvent(ui::KeyEvent* event) {
       ui::ER_CONSUMED : ui::ER_UNHANDLED;
 }
 
-ui::EventResult AcceleratorFilter::OnMouseEvent(ui::MouseEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult AcceleratorFilter::OnScrollEvent(ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult AcceleratorFilter::OnTouchEvent(ui::TouchEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult AcceleratorFilter::OnGestureEvent(ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 }  // namespace internal
 }  // namespace ash
diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h
@@ -22,10 +22,6 @@ class ASH_EXPORT AcceleratorFilter : public ui::EventHandler {
 
   // 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;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter);

diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc
@@ -71,10 +71,6 @@ void MouseCursorEventFilter::HideSharedEdgeIndicator() {
   shared_display_edge_indicator_->Hide();
 }
 
-ui::EventResult MouseCursorEventFilter::OnKeyEvent(ui::KeyEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
   // Handle both MOVED and DRAGGED events here because when the mouse pointer
   // enters the other root window while dragging, the underlying window system
@@ -91,19 +87,6 @@ ui::EventResult MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
       ui::ER_CONSUMED : ui::ER_UNHANDLED;
 }
 
-ui::EventResult MouseCursorEventFilter::OnScrollEvent(ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult MouseCursorEventFilter::OnTouchEvent(ui::TouchEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult MouseCursorEventFilter::OnGestureEvent(
-    ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 bool MouseCursorEventFilter::WarpMouseCursorIfNecessary(
     aura::RootWindow* target_root,
     const gfx::Point& point_in_screen) {

diff --git a/ash/display/mouse_cursor_event_filter.h b/ash/display/mouse_cursor_event_filter.h
@@ -47,11 +47,7 @@ class ASH_EXPORT MouseCursorEventFilter : public ui::EventHandler {
   void HideSharedEdgeIndicator();
 
   // 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;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MouseCursorEventFilterTest, SetMouseWarpModeFlag);

diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
@@ -230,10 +230,6 @@ ui::EventResult DragDropController::OnMouseEvent(ui::MouseEvent* event) {
   return ui::ER_CONSUMED;
 }
 
-ui::EventResult DragDropController::OnScrollEvent(ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult DragDropController::OnTouchEvent(ui::TouchEvent* event) {
   // TODO(sad): Also check for the touch-id.
   // TODO(varunjain): Add code for supporting drag-and-drop across displays
@@ -257,10 +253,6 @@ ui::EventResult DragDropController::OnTouchEvent(ui::TouchEvent* event) {
   return ui::ER_CONSUMED;
 }
 
-ui::EventResult DragDropController::OnGestureEvent(ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 void DragDropController::OnWindowDestroyed(aura::Window* window) {
   if (drag_window_ == window) {
     drag_window_->RemoveObserver(this);

diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
@@ -66,9 +66,7 @@ class ASH_EXPORT DragDropController
   // 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;

diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
@@ -89,10 +89,6 @@ class MoveWindowByClickEventFilter : public ui::EventHandler {
 
  private:
   // ui::EventHandler overrides:
-  virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
-    return ui::ER_UNHANDLED;
-  }
-
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     if (event->type() == ui::ET_MOUSE_RELEASED) {
       Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ -102,18 +98,6 @@ class MoveWindowByClickEventFilter : public ui::EventHandler {
     return ui::ER_UNHANDLED;
   }
 
-  virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE {
-    return ui::ER_UNHANDLED;
-  }
-
-  virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
-    return ui::ER_UNHANDLED;
-  }
-
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
-    return ui::ER_UNHANDLED;
-  }
-
   aura::Window* target_;
   DISALLOW_COPY_AND_ASSIGN(MoveWindowByClickEventFilter);
 };

diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc
@@ -254,10 +254,6 @@ bool LauncherTooltipManager::IsVisible() {
   return widget_ && widget_->IsVisible();
 }
 
-ui::EventResult LauncherTooltipManager::OnKeyEvent(ui::KeyEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult LauncherTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
   DCHECK(event->target());
   DCHECK(event);
@@ -293,10 +289,6 @@ ui::EventResult LauncherTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult LauncherTooltipManager::OnScrollEvent(ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult LauncherTooltipManager::OnTouchEvent(ui::TouchEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
   if (widget_ && widget_->IsVisible() && widget_->GetNativeWindow() != target)

diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h
@@ -71,9 +71,7 @@ class ASH_EXPORT LauncherTooltipManager : public ui::EventHandler,
 
 protected:
   // ui::EventHandler overrides:
-  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;
 

diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
@@ -117,11 +117,8 @@ class MagnificationControllerImpl : virtual public MagnificationController,
   void ValidateScale(float* scale);
 
   // ui::EventHandler overrides:
-  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;
 
   aura::RootWindow* root_window_;
 
@@ -450,10 +447,6 @@ bool MagnificationControllerImpl::IsEnabled() const {
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationControllerImpl: aura::EventFilter implementation
 
-ui::EventResult MagnificationControllerImpl::OnKeyEvent(ui::KeyEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult MagnificationControllerImpl::OnMouseEvent(
     ui::MouseEvent* event) {
   if (IsMagnified() && event->type() == ui::ET_MOUSE_MOVED) {
@@ -492,16 +485,6 @@ ui::EventResult MagnificationControllerImpl::OnScrollEvent(
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult MagnificationControllerImpl::OnTouchEvent(
-    ui::TouchEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult MagnificationControllerImpl::OnGestureEvent(
-    ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationController:
 

diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc
@@ -76,11 +76,6 @@ void PartialMagnificationController::SetEnabled(bool enabled) {
 ////////////////////////////////////////////////////////////////////////////////
 // PartialMagnificationController: ui::EventHandler implementation
 
-ui::EventResult PartialMagnificationController::OnKeyEvent(
-    ui::KeyEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult PartialMagnificationController::OnMouseEvent(
     ui::MouseEvent* event) {
   if (IsPartialMagnified() && event->type() == ui::ET_MOUSE_MOVED) {
@@ -100,21 +95,6 @@ ui::EventResult PartialMagnificationController::OnMouseEvent(
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult PartialMagnificationController::OnScrollEvent(
-    ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult PartialMagnificationController::OnTouchEvent(
-    ui::TouchEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult PartialMagnificationController::OnGestureEvent(
-    ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // PartialMagnificationController: aura::WindowObserver implementation
 

diff --git a/ash/magnifier/partial_magnification_controller.h b/ash/magnifier/partial_magnification_controller.h
@@ -67,11 +67,7 @@ class PartialMagnificationController
   void RemoveZoomWidgetObservers();
 
   // ui::EventHandler overrides:
-  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 WindowObserver:
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;

diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc
@@ -28,10 +28,6 @@ TrayEventFilter::~TrayEventFilter() {
   ash::Shell::GetInstance()->RemovePreTargetHandler(this);
 }
 
-ui::EventResult TrayEventFilter::OnKeyEvent(ui::KeyEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult TrayEventFilter::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED &&
       ProcessLocatedEvent(event)) {
@@ -40,10 +36,6 @@ ui::EventResult TrayEventFilter::OnMouseEvent(ui::MouseEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult TrayEventFilter::OnScrollEvent(ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult TrayEventFilter::OnTouchEvent(ui::TouchEvent* event) {
   if (event->type() == ui::ET_TOUCH_PRESSED &&
       ProcessLocatedEvent(event)) {
@@ -52,10 +44,6 @@ ui::EventResult TrayEventFilter::OnTouchEvent(ui::TouchEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult TrayEventFilter::OnGestureEvent(ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 bool TrayEventFilter::ProcessLocatedEvent(ui::LocatedEvent* event) {
   if (event->target()) {
     aura::Window* target = static_cast<aura::Window*>(event->target());

diff --git a/ash/system/tray/tray_event_filter.h b/ash/system/tray/tray_event_filter.h
@@ -26,11 +26,8 @@ class TrayEventFilter : public ui::EventHandler {
   virtual ~TrayEventFilter();
 
   // 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;
 
  private:
   // Returns true if the event is handled.

diff --git 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
@@ -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;

diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
@@ -182,18 +182,6 @@ void TouchObserverHUD::UpdateTouchPointLabel(int index) {
   touch_labels_[index]->SetText(UTF8ToUTF16(string));
 }
 
-ui::EventResult TouchObserverHUD::OnKeyEvent(ui::KeyEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult TouchObserverHUD::OnMouseEvent(ui::MouseEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult TouchObserverHUD::OnScrollEvent(ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult TouchObserverHUD::OnTouchEvent(ui::TouchEvent* event) {
   if (event->touch_id() >= kMaxTouchPoints)
     return ui::ER_UNHANDLED;
@@ -213,10 +201,6 @@ ui::EventResult TouchObserverHUD::OnTouchEvent(ui::TouchEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult TouchObserverHUD::OnGestureEvent(ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 void TouchObserverHUD::OnWidgetClosing(views::Widget* widget) {
   DCHECK_EQ(widget, widget_);
   widget_ = NULL;

diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
@@ -35,11 +35,7 @@ class TouchObserverHUD : public ui::EventHandler,
   void UpdateTouchPointLabel(int index);
 
   // Overriden 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 views::WidgetObserver:
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;

diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
@@ -246,24 +246,12 @@ void AppListController::UpdateBounds() {
 ////////////////////////////////////////////////////////////////////////////////
 // AppListController, aura::EventFilter implementation:
 
-ui::EventResult AppListController::OnKeyEvent(ui::KeyEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult AppListController::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED)
     ProcessLocatedEvent(event);
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult AppListController::OnScrollEvent(ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::EventResult AppListController::OnTouchEvent(ui::TouchEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 ui::EventResult AppListController::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP)
     ProcessLocatedEvent(event);