Moves management of transients out of Window

ash/wm/overview/scoped_transform_overview_window.cc

 // Copyright 2013 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/wm/overview/scoped_transform_overview_window.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/overview/scoped_window_copy.h"
 #include "ash/wm/window_state.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/views/corewm/window_animations.h"
+#include "ui/views/corewm/window_util.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 // The animation settings used for window selector animations.
 class WindowSelectorAnimationSettings
     : public ui::ScopedLayerAnimationSettings {
  public:
@@ skipping 29 matching lines @@
   result.Translate(new_origin.x(), new_origin.y());
   return result;
 }
 
 void SetTransformOnWindowAndAllTransientChildren(
     aura::Window* window,
     const gfx::Transform& transform,
     bool animate) {
   SetTransformOnWindow(window, transform, animate);
 
-  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;
     gfx::Rect window_bounds = window->bounds();
     gfx::Rect child_bounds = transient_child->bounds();
     gfx::Transform transient_window_transform(
         TranslateTransformOrigin(child_bounds.origin() - window_bounds.origin(),
                                  transform));
     SetTransformOnWindow(transient_child, transient_window_transform, animate);
   }
 }
 
 aura::Window* GetModalTransientParent(aura::Window* window) {
   if (window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_WINDOW)
-    return window->transient_parent();
+    return views::corewm::GetTransientParent(window);
   return NULL;
 }
 
 }  // namespace
 
 const int ScopedTransformOverviewWindow::kTransitionMilliseconds = 200;
 
 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow(
         aura::Window* window)
     : window_(window),
@@ skipping 138 matching lines @@
   if (modal_parent)
     CopyWindowAndTransientParents(target_root, modal_parent);
   window_copies_.push_back(new ScopedWindowCopy(target_root, window));
 }
 
 void ScopedTransformOverviewWindow::SetTransformOnWindowAndTransientChildren(
     const gfx::Transform& transform,
     bool animate) {
   gfx::Point origin(GetBoundsInScreen().origin());
   aura::Window* window = window_;
-  while (window->transient_parent())
-    window = window->transient_parent();
+  while (views::corewm::GetTransientParent(window))
+    window = views::corewm::GetTransientParent(window);
   for (ScopedVector<ScopedWindowCopy>::const_iterator iter =
       window_copies_.begin(); iter != window_copies_.end(); ++iter) {
     SetTransformOnWindow(
         (*iter)->GetWindow(),
         TranslateTransformOrigin(ScreenAsh::ConvertRectToScreen(
             (*iter)->GetWindow()->parent(),
             (*iter)->GetWindow()->GetTargetBounds()).origin() - origin,
             transform),
         animate);
   }
   SetTransformOnWindowAndAllTransientChildren(
       window,
       TranslateTransformOrigin(ScreenAsh::ConvertRectToScreen(
           window->parent(), window->GetTargetBounds()).origin() - origin,
           transform),
       animate);
 }
 
 void ScopedTransformOverviewWindow::PrepareForOverview() {
   DCHECK(!overview_started_);
   overview_started_ = true;
   ash::wm::GetWindowState(window_)->set_ignored_by_shelf(true);
   RestoreWindow();
 }
 
 }  // namespace ash