| Index: ash/wm/workspace/workspace_event_handler.cc
|
| diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc
|
| index 75626ffeef3de4c72a8dd7192c8ffe8ecde69d8e..929d09c284146c784213e8cbd17e42e63446629a 100644
|
| --- a/ash/wm/workspace/workspace_event_handler.cc
|
| +++ b/ash/wm/workspace/workspace_event_handler.cc
|
| @@ -106,15 +106,16 @@ ui::EventResult WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
|
| return ToplevelWindowEventHandler::OnMouseEvent(event);
|
| }
|
|
|
| -ui::EventResult WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) {
|
| +void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) {
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| if (event->type() == ui::ET_GESTURE_DOUBLE_TAP &&
|
| target->delegate()->GetNonClientComponent(event->location()) ==
|
| HTCAPTION) {
|
| ToggleMaximizedState(target); // |this| may be destroyed from here.
|
| - return ui::ER_CONSUMED;
|
| + event->StopPropagation();
|
| + return;
|
| }
|
| - return ToplevelWindowEventHandler::OnGestureEvent(event);
|
| + ToplevelWindowEventHandler::OnGestureEvent(event);
|
| }
|
|
|
| void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(
|
|
|