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

ash/wm/window_manager_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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/cursor_manager.h"
@@ skipping 101 matching lines @@
   Shell::TestApi shell_test(Shell::GetInstance());
   Shell::GetInstance()->RemovePreTargetHandler(
       shell_test.input_method_event_filter());
 
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   root_window->SetBounds(gfx::Rect(0, 0, 510, 510));
 
   // Supplied ids are negative so as not to collide with shell ids.
   // TODO(beng): maybe introduce a MAKE_SHELL_ID() macro that generates a safe
   //             id beyond shell id max?
-  scoped_ptr<aura::Window> w1(aura::test::CreateTestWindow(
-      SK_ColorWHITE, -1, gfx::Rect(10, 10, 500, 500), NULL));
+  scoped_ptr<aura::Window> w1(CreateTestWindowInShell(
+      SK_ColorWHITE, -1, gfx::Rect(10, 10, 500, 500)));
   scoped_ptr<aura::Window> w11(aura::test::CreateTestWindow(
       SK_ColorGREEN, -11, gfx::Rect(5, 5, 100, 100), w1.get()));
   scoped_ptr<aura::Window> w111(aura::test::CreateTestWindow(
       SK_ColorCYAN, -111, gfx::Rect(5, 5, 75, 75), w11.get()));
   scoped_ptr<aura::Window> w1111(aura::test::CreateTestWindow(
       SK_ColorRED, -1111, gfx::Rect(5, 5, 50, 50), w111.get()));
   scoped_ptr<aura::Window> w12(aura::test::CreateTestWindow(
       SK_ColorMAGENTA, -12, gfx::Rect(10, 420, 25, 25), w1.get()));
   aura::test::ColorTestWindowDelegate* w121delegate =
       new aura::test::ColorTestWindowDelegate(SK_ColorYELLOW);
@@ skipping 86 matching lines @@
   EXPECT_EQ(NULL, aura::client::GetFocusClient(w123.get()));
   EXPECT_FALSE(root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev));
 }
 
 // Various assertion testing for activating windows.
 TEST_F(WindowManagerTest, ActivateOnMouse) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
-  scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
-      &wd, -1, gfx::Rect(10, 10, 50, 50), NULL));
+  scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
+      &wd, -1, gfx::Rect(10, 10, 50, 50)));
   d1.SetWindow(w1.get());
   test::TestActivationDelegate d2;
-  scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
-      &wd, -1, gfx::Rect(70, 70, 50, 50), NULL));
+  scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(
+      &wd, -1, gfx::Rect(70, 70, 50, 50)));
   d2.SetWindow(w2.get());
 
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w1.get());
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
   wm::ActivateWindow(w1.get());
@@ skipping 70 matching lines @@
     EXPECT_EQ(w1.get(), wm::GetActiveWindow());
   }
 
   // Clicking on a non-focusable window inside a background window should still
   // give focus to the background window.
   {
     NonFocusableDelegate nfd;
     scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
           &nfd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
     // Move focus to |w2| first.
-    scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
-          &wd, -1, gfx::Rect(70, 70, 50, 50), NULL));
+    scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(
+          &wd, -1, gfx::Rect(70, 70, 50, 50)));
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          w2.get());
     generator.ClickLeftButton();
     EXPECT_EQ(w2.get(), focus_client->GetFocusedWindow());
     EXPECT_FALSE(w11->CanFocus());
 
     // Click on |w11|. This should focus w1.
     generator.MoveMouseToCenterOf(w11.get());
     generator.ClickLeftButton();
     EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   }
 }
 
 // Essentially the same as ActivateOnMouse, but for touch events.
 TEST_F(WindowManagerTest, ActivateOnTouch) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
-  scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
-      &wd, -1, gfx::Rect(10, 10, 50, 50), NULL));
+  scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
+      &wd, -1, gfx::Rect(10, 10, 50, 50)));
   d1.SetWindow(w1.get());
   test::TestActivationDelegate d2;
-  scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
-      &wd, -2, gfx::Rect(70, 70, 50, 50), NULL));
+  scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(
+      &wd, -2, gfx::Rect(70, 70, 50, 50)));
   d2.SetWindow(w2.get());
 
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w1.get());
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
   wm::ActivateWindow(w1.get());
@@ skipping 47 matching lines @@
   EXPECT_EQ(0, d1.lost_active_count());
 }
 
 TEST_F(WindowManagerTest, MouseEventCursors) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   // Create a window.
   const int kWindowLeft = 123;
   const int kWindowTop = 45;
   HitTestWindowDelegate window_delegate;
-  scoped_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
     &window_delegate,
     -1,
-    gfx::Rect(kWindowLeft, kWindowTop, 640, 480),
-    NULL));
+    gfx::Rect(kWindowLeft, kWindowTop, 640, 480)));
 
   // Create two mouse movement events we can switch between.
   gfx::Point point1(kWindowLeft, kWindowTop);
   aura::Window::ConvertPointToTarget(window->parent(), root_window, &point1);
 
   gfx::Point point2(kWindowLeft + 1, kWindowTop + 1);
   aura::Window::ConvertPointToTarget(window->parent(), root_window, &point2);
 
   // Cursor starts as a pointer (set during Shell::Init()).
   EXPECT_EQ(ui::kCursorPointer, root_window->last_cursor().native_type());
@@ skipping 82 matching lines @@
 
   // Rotate it clock-wise 90 degrees.
   gfx::Transform transform;
   transform.Translate(size.width(), 0);
   transform.Rotate(90.0f);
   root_window->SetTransform(transform);
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(
-      CreateTestWindowWithDelegate(&wd, 1, gfx::Rect(0, 10, 50, 50), NULL));
+      CreateTestWindowInShellWithDelegate(&wd, 1, gfx::Rect(0, 10, 50, 50)));
   d1.SetWindow(w1.get());
   w1->Show();
 
   gfx::Point miss_point(5, 5);
   transform.TransformPoint(miss_point);
   ui::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
                           miss_point,
                           miss_point,
                           ui::EF_LEFT_MOUSE_BUTTON);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev1);
@@ skipping 19 matching lines @@
 TEST_F(WindowManagerTest, AdditionalFilters) {
   // The IME event filter interferes with the basic key event propagation we
   // attempt to do here, so we remove it.
   Shell::TestApi shell_test(Shell::GetInstance());
   Shell::GetInstance()->RemovePreTargetHandler(
       shell_test.input_method_event_filter());
 
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   // Creates a window and make it active
-  scoped_ptr<aura::Window> w1(aura::test::CreateTestWindow(
-      SK_ColorWHITE, -1, gfx::Rect(0, 0, 100, 100), NULL));
+  scoped_ptr<aura::Window> w1(CreateTestWindowInShell(
+      SK_ColorWHITE, -1, gfx::Rect(0, 0, 100, 100)));
   wm::ActivateWindow(w1.get());
 
   // Creates two addition filters
   scoped_ptr<CustomEventHandler> f1(new CustomEventHandler);
   scoped_ptr<CustomEventHandler> f2(new CustomEventHandler);
 
   // Adds them to root window event filter.
   views::corewm::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
   env_filter->AddHandler(f1.get());
@@ skipping 48 matching lines @@
   EXPECT_EQ(1, f2->num_mouse_events());
 
   env_filter->RemoveHandler(f2.get());
 }
 
 // We should show and hide the cursor in response to mouse and touch events as
 // requested.
 TEST_F(WindowManagerTest, UpdateCursorVisibility) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   root_window->SetBounds(gfx::Rect(0, 0, 500, 500));
-  scoped_ptr<aura::Window> window(aura::test::CreateTestWindow(
-      SK_ColorWHITE, -1, gfx::Rect(0, 0, 500, 500), NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShell(
+      SK_ColorWHITE, -1, gfx::Rect(0, 0, 500, 500)));
 
   ash::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();
 
   ui::MouseEvent mouse_moved(
       ui::ET_MOUSE_MOVED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
   ui::TouchEvent touch_pressed1(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, getTime());
   ui::TouchEvent touch_pressed2(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 1, getTime());
@@ skipping 29 matching lines @@
   EXPECT_TRUE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
   EXPECT_FALSE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_released2);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 }
 
 }  // namespace ash