Moves management of transients out of Window

ash/wm/overview/window_selector_unittest.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/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 15 matching lines @@
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/transform.h"
+#include "ui/views/corewm/window_util.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 class NonActivatableActivationDelegate
     : public aura::client::ActivationDelegate {
  public:
   virtual bool ShouldActivate() const OVERRIDE {
@@ skipping 639 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
 }
 
 // Tests that windows with modal child windows are transformed with the modal
 // child even though not activatable themselves.
 TEST_F(WindowSelectorTest, ModalChild) {
   gfx::Rect bounds(0, 0, 400, 400);
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> child1(CreateWindow(bounds));
   child1->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
-  window1->AddTransientChild(child1.get());
+  views::corewm::AddTransientChild(window1.get(), child1.get());
   EXPECT_EQ(window1->parent(), child1->parent());
   ToggleOverview();
   EXPECT_TRUE(window1->IsVisible());
   EXPECT_TRUE(child1->IsVisible());
   EXPECT_EQ(ToEnclosingRect(GetTransformedTargetBounds(child1.get())),
       ToEnclosingRect(GetTransformedTargetBounds(window1.get())));
   ToggleOverview();
 }
 
 // Tests that clicking a modal window's parent activates the modal window in
 // overview.
 TEST_F(WindowSelectorTest, ClickModalWindowParent) {
   scoped_ptr<aura::Window> window1(CreateWindow(gfx::Rect(0, 0, 180, 180)));
   scoped_ptr<aura::Window> child1(CreateWindow(gfx::Rect(200, 0, 180, 180)));
   child1->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
-  window1->AddTransientChild(child1.get());
+  views::corewm::AddTransientChild(window1.get(), child1.get());
   EXPECT_FALSE(WindowsOverlapping(window1.get(), child1.get()));
   EXPECT_EQ(window1->parent(), child1->parent());
   ToggleOverview();
   // Given that their relative positions are preserved, the windows should still
   // not overlap.
   EXPECT_FALSE(WindowsOverlapping(window1.get(), child1.get()));
   ClickWindow(window1.get());
   EXPECT_FALSE(IsSelecting());
 
   // Clicking on window1 should activate child1.
@@ skipping 100 matching lines @@
   gfx::Rect root1_rect(0, 0, 100, 100);
   gfx::Rect root2_rect(450, 0, 100, 100);
   scoped_ptr<aura::Window> unmoved1(CreateWindow(root2_rect));
   scoped_ptr<aura::Window> unmoved2(CreateWindow(root2_rect));
   scoped_ptr<aura::Window> moved1_trans_parent(CreateWindow(root1_rect));
   scoped_ptr<aura::Window> moved1(CreateWindow(root1_rect));
   unmoved1->SetName("unmoved1");
   unmoved2->SetName("unmoved2");
   moved1->SetName("moved1");
   moved1->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
-  moved1_trans_parent->AddTransientChild(moved1.get());
+  views::corewm::AddTransientChild(moved1_trans_parent.get(), moved1.get());
   moved1_trans_parent->SetName("moved1_trans_parent");
 
   EXPECT_EQ(root_windows[0], moved1->GetRootWindow());
   EXPECT_EQ(root_windows[0], moved1_trans_parent->GetRootWindow());
   EXPECT_EQ(root_windows[1], unmoved1->GetRootWindow());
   EXPECT_EQ(root_windows[1], unmoved2->GetRootWindow());
   wm::ActivateWindow(unmoved2.get());
   wm::ActivateWindow(unmoved1.get());
 
   Cycle(WindowSelector::FORWARD);
@@ skipping 146 matching lines @@
   wm::ActivateWindow(window1.get());
 
   ToggleOverview();
   EXPECT_TRUE(IsSelecting());
   UpdateDisplay("400x400");
   EXPECT_FALSE(IsSelecting());
 }
 
 }  // namespace internal
 }  // namespace ash