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

Unified Diff: ash/wm/system_gesture_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 | « ash/wm/system_gesture_event_filter.h ('k') | ash/wm/system_modal_container_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter.cc
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
index 49f59cb2578670e6c1f0b533983d6fc3c8245359..6b72be2b1209d61577c1237c65be7952459e9755 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -79,7 +79,7 @@ ui::TouchStatus SystemGestureEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus SystemGestureEventFilter::PreHandleGestureEvent(
+ui::EventResult SystemGestureEventFilter::PreHandleGestureEvent(
aura::Window* target,
ui::GestureEvent* event) {
touch_uma_.RecordGestureEvent(target, *event);
@@ -88,18 +88,18 @@ ui::GestureStatus SystemGestureEventFilter::PreHandleGestureEvent(
if (!target || target == target->GetRootWindow()) {
bezel_gestures_->ProcessGestureEvent(target, *event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
if (two_finger_drag_->ProcessGestureEvent(target, *event))
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
if (!system_gestures_enabled_)
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
aura::Window* system_target = GetTargetForSystemGestureEvent(target);
if (!system_target)
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
RootWindowController* root_controller =
GetRootWindowController(system_target->GetRootWindow());
@@ -115,9 +115,9 @@ ui::GestureStatus SystemGestureEventFilter::PreHandleGestureEvent(
ash::AcceleratorController* accelerator =
ash::Shell::GetInstance()->accelerator_controller();
if (accelerator->PerformAction(CYCLE_FORWARD_MRU, ui::Accelerator()))
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
WindowPinchHandlerMap::iterator find = pinch_handlers_.find(system_target);
@@ -126,18 +126,18 @@ ui::GestureStatus SystemGestureEventFilter::PreHandleGestureEvent(
(*find).second->ProcessGestureEvent(*event);
if (status == SYSTEM_GESTURE_END)
ClearGestureHandlerForWindow(system_target);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
} else {
if (event->type() == ui::ET_GESTURE_BEGIN &&
event->details().touch_points() >=
SystemPinchHandler::kSystemGesturePoints) {
pinch_handlers_[system_target] = new SystemPinchHandler(system_target);
system_target->AddObserver(this);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
}
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
void SystemGestureEventFilter::OnWindowVisibilityChanged(aura::Window* window,
« no previous file with comments | « ash/wm/system_gesture_event_filter.h ('k') | ash/wm/system_modal_container_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698