diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 17:13:08 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 17:13:08 +0000 |
| commit | 2dca2dc97fd303df0c6a1fb11828472ef1c00428 (patch) | |
| tree | 0c167969ade022b0a6219255feedd0d198bcdede /ash/drag_drop | |
| parent | 06ad578f489b38c5f4fc9bc08864f3dc0b3dea4e (diff) | |
| download | chromium_src-2dca2dc97fd303df0c6a1fb11828472ef1c00428.zip chromium_src-2dca2dc97fd303df0c6a1fb11828472ef1c00428.tar.gz chromium_src-2dca2dc97fd303df0c6a1fb11828472ef1c00428.tar.bz2 | |
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
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 8 | ||||
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.h | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 7234b30..da30919 100644 --- 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 index a0e8629..ad897df 100644 --- 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; |