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

Unified Diff: ash/tooltips/tooltip_controller.cc

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit Created 8 years 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/tooltips/tooltip_controller.h ('k') | ash/touch/touch_observer_hud.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/tooltips/tooltip_controller.cc
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 1639419dd13d2bb5dd559a292884e866fc537ffd..21dcab57f82e64613c36b9dfa59bf1ae66d53130 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -302,7 +302,7 @@ ui::EventResult TooltipController::OnMouseEvent(ui::MouseEvent* event) {
return ui::ER_UNHANDLED;
}
-ui::EventResult TooltipController::OnTouchEvent(ui::TouchEvent* event) {
+void TooltipController::OnTouchEvent(ui::TouchEvent* event) {
// TODO(varunjain): need to properly implement tooltips for
// touch events.
// Hide the tooltip for touch events.
@@ -311,7 +311,6 @@ ui::EventResult TooltipController::OnTouchEvent(ui::TouchEvent* event) {
if (tooltip_window_)
tooltip_window_->RemoveObserver(this);
tooltip_window_ = NULL;
- return ui::ER_UNHANDLED;
}
void TooltipController::OnSessionStateEvent(
« no previous file with comments | « ash/tooltips/tooltip_controller.h ('k') | ash/touch/touch_observer_hud.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698