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

Unified Diff: views/view.cc

Issue 6347002: touch: Return an enum from OnTouchEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update tests, add a missed case. Created 9 years, 11 months 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: views/view.cc
diff --git a/views/view.cc b/views/view.cc
index d70e48b236c011ed2499cc721f5a4612c51c1d09..9f147fa39eec814fe9f8d6a53804ed77f74998d7 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -540,11 +540,11 @@ void View::ProcessMouseReleased(const MouseEvent& e, bool canceled) {
}
#if defined(TOUCH_UI)
-bool View::ProcessTouchEvent(const TouchEvent& e) {
+View::TouchStatus View::ProcessTouchEvent(const TouchEvent& e) {
// TODO(rjkroege): Implement a grab scheme similar to as
// as is found in MousePressed.
- const bool result = OnTouchEvent(e);
- return result;
+ const TouchStatus status = OnTouchEvent(e);
+ return status;
}
#endif
@@ -1294,9 +1294,9 @@ void View::OnMouseExited(const MouseEvent& e) {
}
#if defined(TOUCH_UI)
-bool View::OnTouchEvent(const TouchEvent& event) {
+View::TouchStatus View::OnTouchEvent(const TouchEvent& event) {
DVLOG(1) << "visited the OnTouchEvent";
- return false;
+ return TOUCH_STATUS_UNKNOWN;
}
#endif
« no previous file with comments | « views/view.h ('k') | views/view_unittest.cc » ('j') | views/widget/root_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698