Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3518)

Unified Diff: ash/touch/touch_observer_hud.cc

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | ash/wm/app_list_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud.cc
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index 81b6e748b90f6ef5723dc4fd6e6cf594109dd075..3f465c78f08bb2083235883a5a67cf80a8c2ff4c 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -192,11 +192,11 @@ bool TouchObserverHUD::PreHandleMouseEvent(aura::Window* target,
return false;
}
-ui::TouchStatus TouchObserverHUD::PreHandleTouchEvent(
+ui::EventResult TouchObserverHUD::PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) {
if (event->touch_id() >= kMaxTouchPoints)
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
if (event->type() != ui::ET_TOUCH_CANCELLED)
touch_positions_[event->touch_id()] = event->root_location();
@@ -210,7 +210,7 @@ ui::TouchStatus TouchObserverHUD::PreHandleTouchEvent(
widget_->SetSize(widget_->GetContentsView()->GetPreferredSize());
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
ui::EventResult TouchObserverHUD::PreHandleGestureEvent(
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | ash/wm/app_list_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698