s/Move/Stack/ in names of stacking-related methods.

ui/aura/window_unittest.cc

 // Copyright (c) 2011 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/aura/window.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 226 matching lines @@
         CreateTestWindowWithDelegate(&parent_delegate, 0, gfx::Rect(), NULL));
     CreateTestWindowWithDelegate(&child_delegate, 0, gfx::Rect(), parent.get());
   }
   // Both the parent and child should have been destroyed.
   EXPECT_EQ(1, parent_delegate.destroying_count());
   EXPECT_EQ(1, parent_delegate.destroyed_count());
   EXPECT_EQ(1, child_delegate.destroying_count());
   EXPECT_EQ(1, child_delegate.destroyed_count());
 }
 
-// Make sure MoveChildToFront moves both the window and layer to the front.
-TEST_F(WindowTest, MoveChildToFront) {
+// Make sure StackChildAtTop moves both the window and layer to the front.
+TEST_F(WindowTest, StackChildAtTop) {
   Window parent(NULL);
   parent.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   Window child1(NULL);
   child1.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   Window child2(NULL);
   child2.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
 
   child1.SetParent(&parent);
   child2.SetParent(&parent);
   ASSERT_EQ(2u, parent.children().size());
   EXPECT_EQ(&child1, parent.children()[0]);
   EXPECT_EQ(&child2, parent.children()[1]);
   ASSERT_EQ(2u, parent.layer()->children().size());
   EXPECT_EQ(child1.layer(), parent.layer()->children()[0]);
   EXPECT_EQ(child2.layer(), parent.layer()->children()[1]);
 
-  parent.MoveChildToFront(&child1);
+  parent.StackChildAtTop(&child1);
   ASSERT_EQ(2u, parent.children().size());
   EXPECT_EQ(&child1, parent.children()[1]);
   EXPECT_EQ(&child2, parent.children()[0]);
   ASSERT_EQ(2u, parent.layer()->children().size());
   EXPECT_EQ(child1.layer(), parent.layer()->children()[1]);
   EXPECT_EQ(child2.layer(), parent.layer()->children()[0]);
 }
 
-// Various assertions for MoveToFront.
-TEST_F(WindowTest, MoveToFront) {
+// Various assertions for StackAtTop.
+TEST_F(WindowTest, StackAtTop) {
   Window parent(NULL);
   parent.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   Window child1(NULL);
   child1.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   Window child2(NULL);
   child2.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   Window child3(NULL);
   child3.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
 
   child1.SetParent(&parent);
   child2.SetParent(&parent);
 
   // Move 1 in front of 2.
-  parent.MoveChildAbove(&child1, &child2);
+  parent.StackChildAbove(&child1, &child2);
   ASSERT_EQ(2u, parent.children().size());
   EXPECT_EQ(&child2, parent.children()[0]);
   EXPECT_EQ(&child1, parent.children()[1]);
   ASSERT_EQ(2u, parent.layer()->children().size());
   EXPECT_EQ(child2.layer(), parent.layer()->children()[0]);
   EXPECT_EQ(child1.layer(), parent.layer()->children()[1]);
 
   // Add 3, resulting in order [2, 1, 3], then move 2 in front of 1, resulting
   // in [1, 2, 3].
   child3.SetParent(&parent);
-  parent.MoveChildAbove(&child2, &child1);
+  parent.StackChildAbove(&child2, &child1);
   ASSERT_EQ(3u, parent.children().size());
   EXPECT_EQ(&child1, parent.children()[0]);
   EXPECT_EQ(&child2, parent.children()[1]);
   EXPECT_EQ(&child3, parent.children()[2]);
   ASSERT_EQ(3u, parent.layer()->children().size());
   EXPECT_EQ(child1.layer(), parent.layer()->children()[0]);
   EXPECT_EQ(child2.layer(), parent.layer()->children()[1]);
   EXPECT_EQ(child3.layer(), parent.layer()->children()[2]);
 
   // Move 1 in front of 3, resulting in [2 3 1].
-  parent.MoveChildAbove(&child1, &child3);
+  parent.StackChildAbove(&child1, &child3);
   ASSERT_EQ(3u, parent.children().size());
   EXPECT_EQ(&child2, parent.children()[0]);
   EXPECT_EQ(&child3, parent.children()[1]);
   EXPECT_EQ(&child1, parent.children()[2]);
   ASSERT_EQ(3u, parent.layer()->children().size());
   EXPECT_EQ(child2.layer(), parent.layer()->children()[0]);
   EXPECT_EQ(child3.layer(), parent.layer()->children()[1]);
   EXPECT_EQ(child1.layer(), parent.layer()->children()[2]);
 }
 
@@ skipping 425 matching lines @@
             gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()).ToString());
 }
 
 // Various assertions for transient children.
 TEST_F(WindowTest, TransientChildren) {
   scoped_ptr<Window> parent(CreateTestWindowWithId(0, NULL));
   scoped_ptr<Window> w1(CreateTestWindowWithId(1, parent.get()));
   scoped_ptr<Window> w3(CreateTestWindowWithId(3, parent.get()));
   Window* w2 = CreateTestWindowWithId(2, parent.get());
   w1->AddTransientChild(w2);  // w2 is now owned by w1.
-  // Move w1 to the front (end), this should force w2 to be last (on top of w1).
-  parent->MoveChildToFront(w1.get());
+  // Stack w1 at the top (end), this should force w2 to be last (on top of w1).
+  parent->StackChildAtTop(w1.get());
   ASSERT_EQ(3u, parent->children().size());
   EXPECT_EQ(w2, parent->children().back());
 
   // Destroy w1, which should also destroy w3 (since it's a transient child).
   w1.reset();
   w2 = NULL;
   ASSERT_EQ(1u, parent->children().size());
   EXPECT_EQ(w3.get(), parent->children()[0]);
 
   w1.reset(CreateTestWindowWithId(4, parent.get()));
   w2 = CreateTestWindowWithId(5, w3.get());
   w1->AddTransientChild(w2);
-  parent->MoveChildToFront(w3.get());
-  // Move w1 to the front (end), this shouldn't effect w2 since it has a
+  parent->StackChildAtTop(w3.get());
+  // Stack w1 at the top (end), this shouldn't affect w2 since it has a
   // different parent.
-  parent->MoveChildToFront(w1.get());
+  parent->StackChildAtTop(w1.get());
   ASSERT_EQ(2u, parent->children().size());
   EXPECT_EQ(w3.get(), parent->children()[0]);
   EXPECT_EQ(w1.get(), parent->children()[1]);
 }
 
 TEST_F(WindowTest, Property) {
   scoped_ptr<Window> w(CreateTestWindowWithId(0, NULL));
   const char* key = "test";
   EXPECT_EQ(NULL, w->GetProperty(key));
   EXPECT_EQ(0, w->GetIntProperty(key));
@@ skipping 301 matching lines @@
 
   w3->Activate();
   EXPECT_EQ(w2.get(), active());
 
   w1->Activate();
   EXPECT_EQ(w1.get(), active());
 }
 
 }  // namespace test
 }  // namespace aura