Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index 0ef08bc42a6582810d2f2f09f401a6693785e804..ef046bdf8b443d19c3bf49e57a0d1809940143d4 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -70,11 +70,9 @@ void MoveAllWindows(aura::RootWindow* src, |
iter != children.end(); ++iter) { |
aura::Window* window = *iter; |
// Don't move modal screen. |
- if ((id == internal::kShellWindowId_SystemModalContainer || |
- id == internal::kShellWindowId_LockSystemModalContainer) && |
- window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_NONE) { |
+ if (internal::SystemModalContainerLayoutManager::IsModalScreen(window)) |
continue; |
- } |
+ |
// Update the restore bounds to make it relative to the display. |
gfx::Rect restore_bounds; |
if (internal::DisplayController::IsVirtualScreenCoordinatesEnabled()) |