Moves management of transients out of Window

ash/wm/window_modality_controller_unittest.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 "ui/views/corewm/window_modality_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.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/base/ui_base_types.h"
+#include "ui/views/corewm/window_util.h"
 #include "ui/views/test/capture_tracking_view.h"
 #include "ui/views/test/child_modal_window.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 typedef test::AshTestBase WindowModalityControllerTest;
 
 namespace {
@@ skipping 16 matching lines @@
 // - closing a window passes focus up the stack.
 TEST_F(WindowModalityControllerTest, BasicActivation) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w11(
       CreateTestWindowInShellWithDelegate(&d, -11, gfx::Rect()));
   scoped_ptr<aura::Window> w12(
       CreateTestWindowInShellWithDelegate(&d, -12, gfx::Rect()));
 
-  w1->AddTransientChild(w11.get());
+  views::corewm::AddTransientChild(w1.get(), w11.get());
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   wm::ActivateWindow(w11.get());
   EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
 
   w12->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
-  w1->AddTransientChild(w12.get());
+  views::corewm::AddTransientChild(w1.get(), w12.get());
   wm::ActivateWindow(w12.get());
   EXPECT_TRUE(wm::IsActiveWindow(w12.get()));
 
   wm::ActivateWindow(w11.get());
   EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
 
   int check1[] = { -1, -12, -11 };
   EXPECT_TRUE(ValidateStacking(w1->parent(), check1, arraysize(check1)));
 
   wm::ActivateWindow(w1.get());
@@ skipping 19 matching lines @@
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w11(
       CreateTestWindowInShellWithDelegate(&d, -11, gfx::Rect()));
   scoped_ptr<aura::Window> w111(
       CreateTestWindowInShellWithDelegate(&d, -111, gfx::Rect()));
   scoped_ptr<aura::Window> w2(
       CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
 
-  w1->AddTransientChild(w11.get());
-  w11->AddTransientChild(w111.get());
+  views::corewm::AddTransientChild(w1.get(), w11.get());
+  views::corewm::AddTransientChild(w11.get(), w111.get());
 
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   wm::ActivateWindow(w2.get());
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
 
   // Set up modality.
   w11->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
   w111->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
@@ skipping 32 matching lines @@
   scoped_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w11(
       CreateTestWindowInShellWithDelegate(&d, -11, gfx::Rect()));
   // |w111| will be owned and deleted by |w11|.
   aura::Window* w111 =
       CreateTestWindowInShellWithDelegate(&d, -111, gfx::Rect());
   scoped_ptr<aura::Window> w2(
       CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
 
-  w1->AddTransientChild(w11.get());
-  w11->AddTransientChild(w111);
+  views::corewm::AddTransientChild(w1.get(), w11.get());
+  views::corewm::AddTransientChild(w11.get(), w111);
 
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   wm::ActivateWindow(w2.get());
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
 
   // Set up modality.
   w11->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
   w111->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
@@ skipping 12 matching lines @@
 }
 
 // Modality also prevents events from being passed to the transient parent.
 TEST_F(WindowModalityControllerTest, Events) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(&d, -1,
       gfx::Rect(0, 0, 100, 100)));
   scoped_ptr<aura::Window> w11(CreateTestWindowInShellWithDelegate(&d, -11,
       gfx::Rect(20, 20, 50, 50)));
 
-  w1->AddTransientChild(w11.get());
+  views::corewm::AddTransientChild(w1.get(), w11.get());
 
   {
     // Clicking a point within w1 should activate that window.
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   }
 
   w11->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
@@ skipping 18 matching lines @@
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w1.get()));
   scoped_ptr<aura::Window> w2(
       CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
   w2->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
   aura::Window* wt;
   wt = views::corewm::GetModalTransient(w1.get());
   ASSERT_EQ(static_cast<aura::Window*>(NULL), wt);
 
   // Parent w2 to w1. It should get parented to the parent of w1.
-  w1->AddTransientChild(w2.get());
+  views::corewm::AddTransientChild(w1.get(), w2.get());
   ASSERT_EQ(2U, w1->parent()->children().size());
   EXPECT_EQ(-2, w1->parent()->children().at(1)->id());
 
   // Request the modal transient window for w1, it should be w2.
   wt = views::corewm::GetModalTransient(w1.get());
   ASSERT_NE(static_cast<aura::Window*>(NULL), wt);
   EXPECT_EQ(-2, wt->id());
 
   // Request the modal transient window for w11, it should also be w2.
   wt = views::corewm::GetModalTransient(w11.get());
@@ skipping 81 matching lines @@
 TEST_F(WindowModalityControllerTest, TouchEvent) {
   TouchTrackerWindowDelegate d1;
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(&d1,
       -1, gfx::Rect(0, 0, 100, 100)));
   TouchTrackerWindowDelegate d11;
   scoped_ptr<aura::Window> w11(CreateTestWindowInShellWithDelegate(&d11,
       -11, gfx::Rect(20, 20, 50, 50)));
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        gfx::Point(10, 10));
 
-  w1->AddTransientChild(w11.get());
+  views::corewm::AddTransientChild(w1.get(), w11.get());
   d1.reset();
   d11.reset();
 
   {
     // Clicking a point within w1 should activate that window.
     generator.PressMoveAndReleaseTouchTo(gfx::Point(10, 10));
     EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
     EXPECT_TRUE(d1.received_touch());
     EXPECT_FALSE(d11.received_touch());
   }
@@ skipping 168 matching lines @@
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w2(
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w1.get()));
   scoped_ptr<aura::Window> w3(
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w2.get()));
   scoped_ptr<aura::Window> w4(
       CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
   w4->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
-  w1->AddTransientChild(w4.get());
+  views::corewm::AddTransientChild(w1.get(), w4.get());
 
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w2.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w3.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w4.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 }
 
 // Child-modal test for the case when the originally clicked window is an
 // ancestor of the modal parent.
 TEST_F(WindowModalityControllerTest, ChildModalAncestor) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w2(
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w1.get()));
   scoped_ptr<aura::Window> w3(
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w2.get()));
   scoped_ptr<aura::Window> w4(
       CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
   w4->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_CHILD);
   views::corewm::SetModalParent(w4.get(), w2.get());
-  w1->AddTransientChild(w4.get());
+  views::corewm::AddTransientChild(w1.get(), w4.get());
 
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
 
   wm::ActivateWindow(w2.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w3.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w4.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 }
 
 }  // namespace internal
 }  // namespace ash