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/touch | |
| 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/touch')
| -rw-r--r-- | ash/touch/touch_observer_hud.cc | 16 | ||||
| -rw-r--r-- | ash/touch/touch_observer_hud.h | 4 |
2 files changed, 0 insertions, 20 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index b33d500..22dc029 100644 --- 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 index ccfb23d..03c1bac 100644 --- 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; |