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

Unified Diff: ash/tooltips/tooltip_controller.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
Index: ash/tooltips/tooltip_controller.cc
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 0449645587b1b1512a4e45a56bfc486c5ceaae1c..b8a9151b768dc480597239f19cb9f57309ab4695 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -292,7 +292,7 @@ bool TooltipController::PreHandleMouseEvent(aura::Window* target,
return false;
}
-ui::TouchStatus TooltipController::PreHandleTouchEvent(
+ui::EventResult TooltipController::PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) {
// TODO(varunjain): need to properly implement tooltips for
@@ -303,7 +303,7 @@ ui::TouchStatus TooltipController::PreHandleTouchEvent(
if (tooltip_window_)
tooltip_window_->RemoveObserver(this);
tooltip_window_ = NULL;
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
ui::EventResult TooltipController::PreHandleGestureEvent(

Powered by Google App Engine
This is Rietveld 408576698