Change the way the ToplevelEventHandler is hooked up. It is now both a pre- and post-target event h…

ash/wm/workspace/workspace_event_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace/workspace_event_handler.h"
 
 #include "ash/screen_ash.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/events/event.h"
+#include "ui/base/events/event_functions.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace {
 
 void SingleAxisMaximize(aura::Window* window, const gfx::Rect& maximize_rect) {
   gfx::Rect bounds_in_screen =
       ScreenAsh::ConvertRectToScreen(window->parent(), window->bounds());
@@ skipping 48 matching lines @@
       multi_window_resize_controller_.Show(target, component,
                                            event->location());
       break;
     }
     case ui::ET_MOUSE_ENTERED:
       break;
     case ui::ET_MOUSE_CAPTURE_CHANGED:
     case ui::ET_MOUSE_EXITED:
       break;
     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 (event->flags() & ui::EF_IS_DOUBLE_CLICK &&
           target->delegate()->GetNonClientComponent(event->location()) ==
           HTCAPTION) {
         bool destroyed = false;
         destroyed_ = &destroyed;
         ToggleMaximizedState(target);
         if (destroyed)
           return ui::ER_UNHANDLED;
         destroyed_ = NULL;
       }
@@ skipping 67 matching lines @@
                                      target->bounds().y(),
                                      work_area.width(),
                                      target->bounds().height()));
       }
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash