Desktop aura: Break aura::Window::SetParent in two.

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 "ash/wm/window_modality_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/capture_tracking_view.h"
 #include "ash/test/child_modal_window.h"
@@ skipping 25 matching lines @@
 
 // Creates three windows, w1, w11, and w12. w11 is a non-modal transient, w12 is
 // a modal transient.
 // Validates:
 // - it should be possible to activate w12 even when w11 is open.
 // - activating w1 activates w12 and updates stacking order appropriately.
 // - closing a window passes focus up the stack.
 TEST_F(WindowModalityControllerTest, BasicActivation) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
-      aura::test::CreateTestWindowWithDelegate(&d, -1, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w11(
-      aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -11, gfx::Rect()));
   scoped_ptr<aura::Window> w12(
-      aura::test::CreateTestWindowWithDelegate(&d, -12, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -12, gfx::Rect()));
 
   w1->AddTransientChild(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());
   wm::ActivateWindow(w12.get());
@@ skipping 20 matching lines @@
 
 // Create two toplevel windows w1 and w2, and nest two modals w11 and w111 below
 // w1.
 // Validates:
 // - activating w1 while w11/w111 is showing always activates most deeply nested
 //   descendant.
 // - closing a window passes focus up the stack.
 TEST_F(WindowModalityControllerTest, NestedModals) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
-      aura::test::CreateTestWindowWithDelegate(&d, -1, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w11(
-      aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -11, gfx::Rect()));
   scoped_ptr<aura::Window> w111(
-      aura::test::CreateTestWindowWithDelegate(&d, -111, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -111, gfx::Rect()));
   scoped_ptr<aura::Window> w2(
-      aura::test::CreateTestWindowWithDelegate(&d, -2, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
 
   w1->AddTransientChild(w11.get());
   w11->AddTransientChild(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.
@@ skipping 26 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
 }
 
 // Create two toplevel windows w1 and w2, and nest two modals w11 and w111 below
 // w1.
 // Validates:
 // - destroying w11 while w111 is focused activates w1.
 TEST_F(WindowModalityControllerTest, NestedModalsOuterClosed) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
-      aura::test::CreateTestWindowWithDelegate(&d, -1, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w11(
-      aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -11, gfx::Rect()));
   // |w111| will be owned and deleted by |w11|.
   aura::Window* w111 =
-      aura::test::CreateTestWindowWithDelegate(&d, -111, gfx::Rect(), NULL);
+      CreateTestWindowInShellWithDelegate(&d, -111, gfx::Rect());
   scoped_ptr<aura::Window> w2(
-      aura::test::CreateTestWindowWithDelegate(&d, -2, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
 
   w1->AddTransientChild(w11.get());
   w11->AddTransientChild(w111);
 
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   wm::ActivateWindow(w2.get());
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
 
   // Set up modality.
@@ skipping 10 matching lines @@
   // modal window. There is no such use case right now, but it
   // probably should.
 
   w11.reset();
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
 }
 
 // Modality also prevents events from being passed to the transient parent.
 TEST_F(WindowModalityControllerTest, Events) {
   aura::test::TestWindowDelegate d;
-  scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(&d, -1,
-      gfx::Rect(0, 0, 100, 100), NULL));
-  scoped_ptr<aura::Window> w11(aura::test::CreateTestWindowWithDelegate(&d, -11,
-      gfx::Rect(20, 20, 50, 50), NULL));
+  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());
 
   {
     // 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);
 
   {
     // Clicking a point within w1 should activate w11.
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
   }
 }
 
 // Creates windows w1 and non activatiable child w11. Creates transient window
 // w2 and adds it as a transeint child of w1. Ensures that w2 is parented to
 // the parent of w1, and that GetModalTransient(w11) returns w2.
 TEST_F(WindowModalityControllerTest, GetModalTransient) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
-      aura::test::CreateTestWindowWithDelegate(&d, -1, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w11(
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w1.get()));
   scoped_ptr<aura::Window> w2(
-      aura::test::CreateTestWindowWithDelegate(&d, -2, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
   w2->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
   aura::Window* wt;
   wt = wm::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());
   ASSERT_EQ(2U, w1->parent()->children().size());
   EXPECT_EQ(-2, w1->parent()->children().at(1)->id());
@@ skipping 72 matching lines @@
   }
 
   bool received_touch_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchTrackerWindowDelegate);
 };
 
 // Modality should prevent events from being passed to the transient parent.
 TEST_F(WindowModalityControllerTest, TouchEvent) {
   TouchTrackerWindowDelegate d1;
-  scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(&d1,
-      -1, gfx::Rect(0, 0, 100, 100), NULL));
+  scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(&d1,
+      -1, gfx::Rect(0, 0, 100, 100)));
   TouchTrackerWindowDelegate d11;
-  scoped_ptr<aura::Window> w11(aura::test::CreateTestWindowWithDelegate(&d11,
-      -11, gfx::Rect(20, 20, 50, 50), NULL));
+  scoped_ptr<aura::Window> w11(CreateTestWindowInShellWithDelegate(&d11,
+      -11, gfx::Rect(20, 20, 50, 50)));
 
   w1->AddTransientChild(w11.get());
   d1.reset();
   d11.reset();
 
   {
     // Clicking a point within w1 should activate that window.
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          gfx::Point(10, 10));
     generator.PressMoveAndReleaseTouchTo(gfx::Point(10, 10));
@@ skipping 163 matching lines @@
     EXPECT_FALSE(modal_parent->HasFocus());
     EXPECT_FALSE(parent->HasFocus());
   }
 }
 
 // Window-modal test for the case when the originally clicked window is an
 // ancestor of the modal parent.
 TEST_F(WindowModalityControllerTest, WindowModalAncestor) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
-      aura::test::CreateTestWindowWithDelegate(&d, -1, gfx::Rect(), NULL));
+      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(
-      aura::test::CreateTestWindowWithDelegate(&d, -2, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
   w4->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
   w1->AddTransientChild(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(
-      aura::test::CreateTestWindowWithDelegate(&d, -1, gfx::Rect(), NULL));
+      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(
-      aura::test::CreateTestWindowWithDelegate(&d, -2, gfx::Rect(), NULL));
+      CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
   w4->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_CHILD);
   ash::wm::SetModalParent(w4.get(), w2.get());
   w1->AddTransientChild(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