Moves management of transients out of Window

ash/display/screen_position_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/display/screen_position_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/corewm/window_util.h"
 
 namespace ash {
 namespace {
 
 // Return true if the window or its ancestor has |kStayInSameRootWindowkey|
 // property.
 bool ShouldStayInSameRootWindow(const aura::Window* window) {
   return window &&
       (window->GetProperty(internal::kStayInSameRootWindowKey) ||
        ShouldStayInSameRootWindow(window->parent()));
 }
 
 // Move all transient children to |dst_root|, including the ones in
 // the child windows and transient children of the transient children.
 void MoveAllTransientChildrenToNewRoot(const gfx::Display& display,
                                        aura::Window* window) {
   aura::Window* dst_root = Shell::GetInstance()->display_controller()->
       GetRootWindowForDisplayId(display.id());
-  aura::Window::Windows transient_children = window->transient_children();
+  aura::Window::Windows transient_children =
+      views::corewm::GetTransientChildren(window);
   for (aura::Window::Windows::iterator iter = transient_children.begin();
        iter != transient_children.end(); ++iter) {
     aura::Window* transient_child = *iter;
     int container_id = transient_child->parent()->id();
     DCHECK_GE(container_id, 0);
     aura::Window* container = Shell::GetContainer(dst_root, container_id);
     gfx::Rect parent_bounds_in_screen = transient_child->GetBoundsInScreen();
     container->AddChild(transient_child);
     transient_child->SetBoundsInScreen(parent_bounds_in_screen, display);
 
@@ skipping 104 matching lines @@
     window->SetBounds(bounds);
     return;
   }
 
   // Don't move a window to other root window if:
   // a) the window is a transient window. It moves when its
   //    transient_parent moves.
   // b) if the window or its ancestor has kStayInSameRootWindowkey. It's
   //    intentionally kept in the same root window even if the bounds is
   //    outside of the display.
-  if (!window->transient_parent() &&
+  if (!views::corewm::GetTransientParent(window) &&
       !ShouldStayInSameRootWindow(window)) {
     aura::Window* dst_root =
         Shell::GetInstance()->display_controller()->GetRootWindowForDisplayId(
             display.id());
     DCHECK(dst_root);
     aura::Window* dst_container = NULL;
     if (dst_root != window->GetRootWindow()) {
       int container_id = window->parent()->id();
       // All containers that uses screen coordinates must have valid window ids.
       DCHECK_GE(container_id, 0);
@@ skipping 33 matching lines @@
 
   gfx::Point origin(bounds.origin());
   const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
       window).bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds.size()));
 }
 
 }  // internal
 }  // ash