Avoids updating dock alignment when drag is cancelled

ash/wm/dock/docked_window_resizer.cc

 // Copyright 2013 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/dock/docked_window_resizer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf.h"
@@ skipping 95 matching lines @@
   is_docked_ = dock_layout_->is_dragged_window_docked();
   // Whenever a window is dragged out of the dock it will be auto-sized
   // in the dock if it gets docked again.
   if (!is_docked_)
     was_bounds_changed_by_user_ = false;
 }
 
 void DockedWindowResizer::CompleteDrag() {
   // The root window can change when dragging into a different screen.
   next_window_resizer_->CompleteDrag();
-  FinishedDragging();
+  FinishedDragging(aura::client::MOVE_SUCCESSFUL);
 }
 
 void DockedWindowResizer::RevertDrag() {
   next_window_resizer_->RevertDrag();
   // Restore docked state to what it was before the drag if necessary.
   if (is_docked_ != was_docked_) {
     is_docked_ = was_docked_;
     if (is_docked_)
       dock_layout_->DockDraggedWindow(GetTarget());
     else
       dock_layout_->UndockDraggedWindow();
   }
-  FinishedDragging();
+  FinishedDragging(aura::client::MOVE_CANCELED);
 }
 
 DockedWindowResizer::DockedWindowResizer(WindowResizer* next_window_resizer,
                                          wm::WindowState* window_state)
     : WindowResizer(window_state),
       next_window_resizer_(next_window_resizer),
       dock_layout_(NULL),
       initial_dock_layout_(NULL),
       did_move_or_resize_(false),
       was_docked_(false),
@@ skipping 66 matching lines @@
         GetTarget()->GetRootWindow(),
         kShellWindowId_DockedContainer);
     wm::ReparentChildWithTransientChildren(GetTarget(),
                                            GetTarget()->parent(),
                                            docked_container);
   }
   if (is_docked_)
     dock_layout_->DockDraggedWindow(GetTarget());
 }
 
-void DockedWindowResizer::FinishedDragging() {
+void DockedWindowResizer::FinishedDragging(
+    aura::client::WindowMoveResult move_result) {
   if (!did_move_or_resize_)
     return;
   did_move_or_resize_ = false;
   aura::Window* window = GetTarget();
   const bool is_attached_panel = window->type() == ui::wm::WINDOW_TYPE_PANEL &&
                                  window_state_->panel_attached();
   const bool is_resized =
       (details().bounds_change & WindowResizer::kBoundsChange_Resizes) != 0;
 
   // When drag is completed the dragged docked window is resized to the bounds
@@ skipping 11 matching lines @@
     gfx::Rect restore_bounds = window->GetBoundsInScreen();
     restore_bounds.set_height(
         window_state_->GetRestoreBoundsInScreen().height());
     window_state_->SetRestoreBoundsInScreen(restore_bounds);
   }
 
   // Check if the window needs to be docked or returned to workspace.
   DockedAction action = MaybeReparentWindowOnDragCompletion(is_resized,
                                                             is_attached_panel);
   dock_layout_->FinishDragging(
-      action,
+      move_result == aura::client::MOVE_CANCELED ? DOCKED_ACTION_NONE : action,
       details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE ?
           DOCKED_ACTION_SOURCE_MOUSE : DOCKED_ACTION_SOURCE_TOUCH);
 
   // If we started the drag in one root window and moved into another root
   // but then canceled the drag we may need to inform the original layout
   // manager that the drag is finished.
   if (initial_dock_layout_ != dock_layout_)
     initial_dock_layout_->FinishDragging(
         DOCKED_ACTION_NONE,
         details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE ?
@@ skipping 52 matching lines @@
   // before.
   if (is_docked_) {
     wm::GetWindowState(window)->set_bounds_changed_by_user(
         was_docked_ && (is_resized || was_bounds_changed_by_user_));
   }
   return action;
 }
 
 }  // namespace internal
 }  // namespace ash