| 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 929d09c284146c784213e8cbd17e42e63446629a..5e1a8a6a6f8914915fc610e4c37ee1db5b66ba7e 100644
|
| --- a/ash/wm/workspace/workspace_event_handler.cc
|
| +++ b/ash/wm/workspace/workspace_event_handler.cc
|
| @@ -65,7 +65,7 @@ WorkspaceEventHandler::~WorkspaceEventHandler() {
|
| *destroyed_ = true;
|
| }
|
|
|
| -ui::EventResult WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
|
| +void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| switch (event->type()) {
|
| case ui::ET_MOUSE_MOVED: {
|
| @@ -83,8 +83,10 @@ ui::EventResult WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
|
| case ui::ET_MOUSE_PRESSED: {
|
| // Maximize behavior is implemented as post-target handling so the target
|
| // can cancel it.
|
| - if (ui::EventCanceledDefaultHandling(*event))
|
| - return ToplevelWindowEventHandler::OnMouseEvent(event);
|
| + if (ui::EventCanceledDefaultHandling(*event)) {
|
| + ToplevelWindowEventHandler::OnMouseEvent(event);
|
| + return;
|
| + }
|
|
|
| if (event->flags() & ui::EF_IS_DOUBLE_CLICK &&
|
| target->delegate()->GetNonClientComponent(event->location()) ==
|
| @@ -93,7 +95,7 @@ ui::EventResult WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
|
| destroyed_ = &destroyed;
|
| ToggleMaximizedState(target);
|
| if (destroyed)
|
| - return ui::ER_UNHANDLED;
|
| + return;
|
| destroyed_ = NULL;
|
| }
|
| multi_window_resize_controller_.Hide();
|
| @@ -103,7 +105,7 @@ ui::EventResult WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
|
| default:
|
| break;
|
| }
|
| - return ToplevelWindowEventHandler::OnMouseEvent(event);
|
| + ToplevelWindowEventHandler::OnMouseEvent(event);
|
| }
|
|
|
| void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) {
|
|
|