| 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 5e40f93de5dc303c04ec386dd37b6ccc45ff5670..57aecd42458c0f618c2a8315442b4b900eba0c2a 100644
|
| --- a/ash/wm/system_gesture_event_filter.cc
|
| +++ b/ash/wm/system_gesture_event_filter.cc
|
| @@ -72,8 +72,7 @@ ui::EventResult SystemGestureEventFilter::OnTouchEvent(ui::TouchEvent* event) {
|
| return ui::ER_UNHANDLED;
|
| }
|
|
|
| -ui::EventResult SystemGestureEventFilter::OnGestureEvent(
|
| - ui::GestureEvent* event) {
|
| +void SystemGestureEventFilter::OnGestureEvent(ui::GestureEvent* event) {
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| touch_uma_.RecordGestureEvent(target, *event);
|
| long_press_affordance_->ProcessEvent(target, event,
|
| @@ -81,18 +80,21 @@ ui::EventResult SystemGestureEventFilter::OnGestureEvent(
|
|
|
| if (!target || target == target->GetRootWindow()) {
|
| bezel_gestures_->ProcessGestureEvent(target, *event);
|
| - return ui::ER_CONSUMED;
|
| + event->StopPropagation();
|
| + return;
|
| }
|
|
|
| - if (two_finger_drag_->ProcessGestureEvent(target, *event))
|
| - return ui::ER_CONSUMED;
|
| + if (two_finger_drag_->ProcessGestureEvent(target, *event)) {
|
| + event->StopPropagation();
|
| + return;
|
| + }
|
|
|
| if (!system_gestures_enabled_)
|
| - return ui::ER_UNHANDLED;
|
| + return;
|
|
|
| aura::Window* system_target = GetTargetForSystemGestureEvent(target);
|
| if (!system_target)
|
| - return ui::ER_UNHANDLED;
|
| + return;
|
|
|
| RootWindowController* root_controller =
|
| GetRootWindowController(system_target->GetRootWindow());
|
| @@ -108,9 +110,9 @@ ui::EventResult SystemGestureEventFilter::OnGestureEvent(
|
| ash::AcceleratorController* accelerator =
|
| ash::Shell::GetInstance()->accelerator_controller();
|
| if (accelerator->PerformAction(CYCLE_FORWARD_MRU, ui::Accelerator()))
|
| - return ui::ER_CONSUMED;
|
| + event->StopPropagation();
|
| }
|
| - return ui::ER_UNHANDLED;
|
| + return;
|
| }
|
|
|
| WindowPinchHandlerMap::iterator find = pinch_handlers_.find(system_target);
|
| @@ -119,18 +121,16 @@ ui::EventResult SystemGestureEventFilter::OnGestureEvent(
|
| (*find).second->ProcessGestureEvent(*event);
|
| if (status == SYSTEM_GESTURE_END)
|
| ClearGestureHandlerForWindow(system_target);
|
| - return ui::ER_CONSUMED;
|
| + event->StopPropagation();
|
| } 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::ER_CONSUMED;
|
| + event->StopPropagation();
|
| }
|
| }
|
| -
|
| - return ui::ER_UNHANDLED;
|
| }
|
|
|
| void SystemGestureEventFilter::OnWindowVisibilityChanged(aura::Window* window,
|
|
|