summaryrefslogtreecommitdiffstats
path: root/ash/wm/workspace/workspace_layout_manager.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/workspace/workspace_layout_manager.cc')
-rw-r--r--ash/wm/workspace/workspace_layout_manager.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc
index ceffce9..63c4aed 100644
--- a/ash/wm/workspace/workspace_layout_manager.cc
+++ b/ash/wm/workspace/workspace_layout_manager.cc
@@ -162,7 +162,10 @@ void WorkspaceLayoutManager::OnKeyboardBoundsChanging(
SetChildBounds(window, gfx::Rect(origin, window_bounds.size()));
}
} else if (window_state->HasRestoreBounds()) {
- // Keyboard hidden, restore original bounds if they exist.
+ // Keyboard hidden, restore original bounds if they exist. If the user has
+ // resized or dragged the window in the meantime, WorkspaceWindowResizer
+ // will have cleared the restore bounds and this code will not accidentally
+ // override user intent.
window_state->SetAndClearRestoreBounds();
}
}