summaryrefslogtreecommitdiffstats
path: root/ash/touch
diff options
context:
space:
mode:
Diffstat (limited to 'ash/touch')
-rw-r--r--ash/touch/touch_observer_hud.cc6
-rw-r--r--ash/touch/touch_observer_hud.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index 22dc029..176e52f 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -182,9 +182,9 @@ void TouchObserverHUD::UpdateTouchPointLabel(int index) {
touch_labels_[index]->SetText(UTF8ToUTF16(string));
}
-ui::EventResult TouchObserverHUD::OnTouchEvent(ui::TouchEvent* event) {
+void TouchObserverHUD::OnTouchEvent(ui::TouchEvent* event) {
if (event->touch_id() >= kMaxTouchPoints)
- return ui::ER_UNHANDLED;
+ return;
if (event->type() != ui::ET_TOUCH_CANCELLED)
touch_positions_[event->touch_id()] = event->root_location();
@@ -197,8 +197,6 @@ ui::EventResult TouchObserverHUD::OnTouchEvent(ui::TouchEvent* event) {
UpdateTouchPointLabel(event->touch_id());
widget_->SetSize(widget_->GetContentsView()->GetPreferredSize());
-
- return ui::ER_UNHANDLED;
}
void TouchObserverHUD::OnWidgetClosing(views::Widget* widget) {
diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
index 03c1bac..acee910 100644
--- a/ash/touch/touch_observer_hud.h
+++ b/ash/touch/touch_observer_hud.h
@@ -35,7 +35,7 @@ class TouchObserverHUD : public ui::EventHandler,
void UpdateTouchPointLabel(int index);
// Overriden from ui::EventHandler:
- virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+ virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
// Overridden from views::WidgetObserver:
virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;