Undock window when reverting a drag

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/ash_switches.h"
 #include "ash/display/display_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/dock/docked_window_layout_manager.h"
@@ skipping 117 matching lines @@
 void DockedWindowResizer::RevertDrag() {
   // Temporarily clear kWindowTrackedByWorkspaceKey for panels so that they
   // don't get forced into the workspace that may be shrunken because of docked
   // windows.
   wm::WindowState* window_state = wm::GetWindowState(GetTarget());
   bool was_tracked_by_workspace = window_state->tracked_by_workspace();
   if (was_docked_)
     window_state->SetTrackedByWorkspace(false);
   next_window_resizer_->RevertDrag();
   // Restore docked state to what it was before the drag if necessary.
-  if (was_docked_ && !is_docked_) {
-    dock_layout_->DockDraggedWindow(GetTarget());
+  if (is_docked_ != was_docked_) {
     is_docked_ = was_docked_;
+    if (is_docked_)
+      dock_layout_->DockDraggedWindow(GetTarget());
+    else
+      dock_layout_->UndockDraggedWindow();
   }
   FinishedDragging();
   window_state->SetTrackedByWorkspace(was_tracked_by_workspace);
 }
 
 aura::Window* DockedWindowResizer::GetTarget() {
   return next_window_resizer_->GetTarget();
 }
 
 const gfx::Point& DockedWindowResizer::GetInitialLocation() const {
@@ skipping 131 matching lines @@
   // 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();
   is_docked_ = false;
 }
 
 }  // namespace internal
 }  // namespace ash