| 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 7d832e9de3bc900b3ea93a861d3ded9b12485051..77fdc992950b15c2ecebfc8f25dbd3f19e3e230f 100644
|
| --- a/ash/wm/dock/docked_window_resizer.cc
|
| +++ b/ash/wm/dock/docked_window_resizer.cc
|
| @@ -227,12 +227,8 @@ void DockedWindowResizer::FinishedDragging(
|
| // Undock the window if it is not in the normal or minimized show type. This
|
| // happens if a user snaps or maximizes a window using a keyboard shortcut
|
| // while it is being dragged.
|
| - if (window_state_->IsSnapped()) {
|
| + if (!window_state_->IsMinimized() && !window_state_->IsNormalShowType())
|
| is_docked_ = false;
|
| - } else if (!window_state_->IsMinimized() &&
|
| - !window_state_->IsNormalShowState()) {
|
| - is_docked_ = false;
|
| - }
|
|
|
| // When drag is completed the dragged docked window is resized to the bounds
|
| // calculated by the layout manager that conform to other docked windows.
|
|
|