Only drag or maximize / restore when event has not yet been handled.

ash/wm/toplevel_window_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/toplevel_window_event_handler.h"
 
 #include "ash/shell.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_state.h"
@@ skipping 166 matching lines @@
   if (window_resizer_.get() && !in_gesture_drag_)
     return;
 
   if (window_resizer_.get() &&
       window_resizer_->resizer()->GetTarget() != target) {
     return;
   }
 
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN: {
+      if (event->handled())
+        return;
       int component =
           target->delegate()->GetNonClientComponent(event->location());
       if (!(WindowResizer::GetBoundsChangeForWindowComponent(component) &
             WindowResizer::kBoundsChange_Resizes))
         return;
       internal::ResizeShadowController* controller =
           Shell::GetInstance()->resize_shadow_controller();
       if (controller)
         controller->ShowShadow(target, component);
       return;
     }
     case ui::ET_GESTURE_END: {
       internal::ResizeShadowController* controller =
           Shell::GetInstance()->resize_shadow_controller();
       if (controller)
         controller->HideShadow(target);
       return;
     }
     case ui::ET_GESTURE_SCROLL_BEGIN: {
-      if (in_gesture_drag_)
+      if (in_gesture_drag_ || event->handled())
         return;
       int component =
           target->delegate()->GetNonClientComponent(event->location());
       if (WindowResizer::GetBoundsChangeForWindowComponent(component) == 0)
         return;
       gfx::Point location_in_parent(
           ConvertPointToParent(target, event->location()));
       AttemptToStartDrag(target, location_in_parent, component,
                          aura::client::WINDOW_MOVE_SOURCE_TOUCH);
       event->StopPropagation();
@@ skipping 128 matching lines @@
   drag_reverted_ = (status == DRAG_REVERT);
 
   in_gesture_drag_ = false;
   if (in_move_loop_)
     quit_closure_.Run();
 }
 
 void ToplevelWindowEventHandler::HandleMousePressed(
     aura::Window* target,
     ui::MouseEvent* event) {
-  if (event->phase() != ui::EP_PRETARGET)
+  if (event->phase() != ui::EP_PRETARGET || event->handled())
     return;
 
   // We also update the current window component here because for the
   // mouse-drag-release-press case, where the mouse is released and
   // pressed without mouse move event.
   int component =
       target->delegate()->GetNonClientComponent(event->location());
   if ((event->flags() &
         (ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_TRIPLE_CLICK)) == 0 &&
       WindowResizer::GetBoundsChangeForWindowComponent(component)) {
@@ skipping 13 matching lines @@
   if (event->phase() != ui::EP_PRETARGET)
     return;
 
   CompleteDrag(event->type() == ui::ET_MOUSE_RELEASED ?
                    DRAG_COMPLETE : DRAG_REVERT);
   // Completing the drag may result in hiding the window. If this happens
   // return true so no other handlers/observers see the event. Otherwise
   // they see the event on a hidden window.
   if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED &&
       !target->IsVisible()) {
     event->StopPropagation();

[pkotwicz, 2014/01/21 22:22:39]

Can you do me a favor and only call StopPropagation() here if we have a
|window_resizer_| ?

[flackr, 2014/01/29 15:27:32]

Done.

   }
 }
 
 void ToplevelWindowEventHandler::HandleDrag(
     aura::Window* target,
     ui::LocatedEvent* event) {
   // This function only be triggered to move window
   // by mouse drag or touch move event.
   DCHECK(event->type() == ui::ET_MOUSE_DRAGGED ||
          event->type() == ui::ET_TOUCH_MOVED ||
@@ skipping 89 matching lines @@
 
 void ToplevelWindowEventHandler::ResizerWindowDestroyed() {
   // We explicitly don't invoke RevertDrag() since that may do things to window.
   // Instead we destroy the resizer.
   window_resizer_.reset();
 
   CompleteDrag(DRAG_REVERT);
 }
 
 }  // namespace ash