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

Unified Diff: ui/views/view.h

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 | « ui/views/corewm/window_modality_controller.cc ('k') | ui/views/view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.h
diff --git a/ui/views/view.h b/ui/views/view.h
index fee62b6630d9d34f35b370004897eb0cdde7780f..d19bec652a93e6c55e068adbb3db45cdbe4fbaf7 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -653,8 +653,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
// Overridden from ui::EventHandler:
virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
- virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
- virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+ virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
+ virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
// Accelerators --------------------------------------------------------------
@@ -1296,9 +1296,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
bool ProcessMouseDragged(const ui::MouseEvent& event, DragInfo* drop_info);
void ProcessMouseReleased(const ui::MouseEvent& event);
- // RootView will invoke this with incoming TouchEvents. Returns the result
- // of OnTouchEvent.
- ui::EventResult ProcessTouchEvent(ui::TouchEvent* event);
+ // RootView will invoke this with incoming TouchEvents.
+ void ProcessTouchEvent(ui::TouchEvent* event);
// RootView will invoke this with incoming GestureEvents. This invokes
// OnGestureEvent.
« no previous file with comments | « ui/views/corewm/window_modality_controller.cc ('k') | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698