| 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..228cb16babf8580c3d895d9786b7a537d5943a5b 100644
|
| --- a/ash/wm/dock/docked_window_resizer.cc
|
| +++ b/ash/wm/dock/docked_window_resizer.cc
|
| @@ -124,8 +124,7 @@ void DockedWindowResizer::CompleteDrag(int event_flags) {
|
| // 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);
|
| + window_state->SetTrackedByWorkspace(false);
|
| // The root window can change when dragging into a different screen.
|
| next_window_resizer_->CompleteDrag(event_flags);
|
| FinishedDragging();
|
| @@ -138,8 +137,7 @@ void DockedWindowResizer::RevertDrag() {
|
| // 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);
|
| + 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_) {
|
|
|