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

Unified Diff: ui/aura/shared/compound_event_filter.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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
« no previous file with comments | « ui/aura/shared/compound_event_filter.h ('k') | ui/aura/shared/compound_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/shared/compound_event_filter.cc
diff --git a/ui/aura/shared/compound_event_filter.cc b/ui/aura/shared/compound_event_filter.cc
index 9ace7c62e8b4ee828bd1c884c8fb6a5db64240b0..ca2343f461ed157b0b4269b0ca13819f83c99356 100644
--- a/ui/aura/shared/compound_event_filter.cc
+++ b/ui/aura/shared/compound_event_filter.cc
@@ -133,14 +133,14 @@ ui::TouchStatus CompoundEventFilter::PreHandleTouchEvent(
return status;
}
-ui::GestureStatus CompoundEventFilter::PreHandleGestureEvent(
+ui::EventResult CompoundEventFilter::PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) {
- ui::GestureStatus status = ui::GESTURE_STATUS_UNKNOWN;
+ ui::EventResult status = ui::ER_UNHANDLED;
if (filters_.might_have_observers()) {
ObserverListBase<EventFilter>::Iterator it(filters_);
EventFilter* filter;
- while (status == ui::GESTURE_STATUS_UNKNOWN &&
+ while (status == ui::ER_UNHANDLED &&
(filter = it.GetNext()) != NULL) {
status = filter->PreHandleGestureEvent(target, event);
}
@@ -148,7 +148,7 @@ ui::GestureStatus CompoundEventFilter::PreHandleGestureEvent(
if (event->type() == ui::ET_GESTURE_BEGIN &&
event->details().touch_points() == 1 &&
- status != ui::GESTURE_STATUS_CONSUMED &&
+ status != ui::ER_CONSUMED &&
target->GetRootWindow() &&
GetActiveWindow(target) != target) {
target->GetFocusManager()->SetFocusedWindow(
« no previous file with comments | « ui/aura/shared/compound_event_filter.h ('k') | ui/aura/shared/compound_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698