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

Unified Diff: ui/views/corewm/compound_event_filter.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/compound_event_filter.h ('k') | ui/views/corewm/focus_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/compound_event_filter.cc
diff --git a/ui/views/corewm/compound_event_filter.cc b/ui/views/corewm/compound_event_filter.cc
index 0b77b28ae3f479f49762bee7c48973c9590cfc0f..83e6106ad86e03a6b9adfd077f1e7370b320f3c6 100644
--- a/ui/views/corewm/compound_event_filter.cc
+++ b/ui/views/corewm/compound_event_filter.cc
@@ -148,15 +148,13 @@ void CompoundEventFilter::FilterKeyEvent(ui::KeyEvent* event) {
}
}
-ui::EventResult CompoundEventFilter::FilterMouseEvent(ui::MouseEvent* event) {
- int result = ui::ER_UNHANDLED;
+void CompoundEventFilter::FilterMouseEvent(ui::MouseEvent* event) {
if (handlers_.might_have_observers()) {
ObserverListBase<ui::EventHandler>::Iterator it(handlers_);
ui::EventHandler* handler;
- while (!(result & ui::ER_CONSUMED) && (handler = it.GetNext()) != NULL)
- result |= handler->OnMouseEvent(event);
+ while (!event->stopped_propagation() && (handler = it.GetNext()) != NULL)
+ handler->OnMouseEvent(event);
}
- return static_cast<ui::EventResult>(result);
}
void CompoundEventFilter::FilterTouchEvent(ui::TouchEvent* event) {
@@ -199,7 +197,7 @@ void CompoundEventFilter::OnKeyEvent(ui::KeyEvent* event) {
FilterKeyEvent(event);
}
-ui::EventResult CompoundEventFilter::OnMouseEvent(ui::MouseEvent* event) {
+void CompoundEventFilter::OnMouseEvent(ui::MouseEvent* event) {
aura::Window* window = static_cast<aura::Window*>(event->target());
aura::WindowTracker window_tracker;
window_tracker.Add(window);
@@ -220,7 +218,7 @@ ui::EventResult CompoundEventFilter::OnMouseEvent(ui::MouseEvent* event) {
UpdateCursor(window, event);
}
- return FilterMouseEvent(event);
+ FilterMouseEvent(event);
}
void CompoundEventFilter::OnScrollEvent(ui::ScrollEvent* event) {
« no previous file with comments | « ui/views/corewm/compound_event_filter.h ('k') | ui/views/corewm/focus_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698