Index: ash/wm/dock/docked_window_resizer.cc |
diff --git a/ash/wm/dock/docked_window_resizer.cc b/ash/wm/dock/docked_window_resizer.cc |
index 28d043848b298463ceae29a7f7289faed357b3df..f186a319e8a1b50959e939e1dc0601c70d0911f0 100644 |
--- a/ash/wm/dock/docked_window_resizer.cc |
+++ b/ash/wm/dock/docked_window_resizer.cc |
@@ -4,7 +4,6 @@ |
#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" |
@@ -142,9 +141,12 @@ void DockedWindowResizer::RevertDrag() { |
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 (was_docked_ != is_docked_) { |
is_docked_ = was_docked_; |
+ if (is_docked_) |
+ dock_layout_->DockDraggedWindow(GetTarget()); |
+ else |
+ dock_layout_->UndockDraggedWindow(); |
flackr
2013/11/01 16:52:28
separate cl
varkha
2013/11/05 20:34:23
Done. https://codereview.chromium.org/46893003/.
|
} |
FinishedDragging(); |
window_state->SetTrackedByWorkspace(was_tracked_by_workspace); |