Move a window if the sceren bounds being set is in other display.

ash/root_window_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_controller.h"
 
 #include <vector>
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
@@ skipping 52 matching lines @@
   };
   for (size_t i = 0; i < arraysize(kContainerIdsToMove); i++) {
     int id = kContainerIdsToMove[i];
     aura::Window* src_container = Shell::GetContainer(src, id);
     aura::Window* dst_container = Shell::GetContainer(dst, id);
     aura::Window::Windows children = src_container->children();
     for (aura::Window::Windows::iterator iter = children.begin();
          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())
         restore_bounds = GetRestoreBoundsInParent(window);
       dst_container->AddChild(window);
       if (!restore_bounds.IsEmpty())
         SetRestoreBoundsInParent(window, restore_bounds);
     }
   }
 }
@@ skipping 224 matching lines @@
   // Restore focused or active window if it's still alive.
   if (focused && tracker.Contains(focused) && dst->Contains(focused)) {
     dst->GetFocusManager()->SetFocusedWindow(focused, NULL);
   } else if (active && tracker.Contains(active) && dst->Contains(active)) {
     activation_client->ActivateWindow(active);
   }
 }
 
 }  // namespace internal
 }  // namespace ash