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

This renames methods in aura::Window, views::Widget, and
gfx::Layer.  "MoveAbove" becomes "StackAbove" and
"MoveToFront" becomes "StackAtTop".

BUG=none
TEST=built it

Review URL: http://codereview.chromium.org/8620002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111168 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 67 insertions, 67 deletions

diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc
index 056490b..a4aa58e 100644
--- a/ui/aura/desktop.cc
+++ b/ui/aura/desktop.cc
@@ -300,7 +300,7 @@ void Desktop::SetActiveWindow(Window* window, Window* to_focus) {
   if (old_active && old_active->delegate())
     old_active->delegate()->OnLostActive();
   if (active_window_) {
-    active_window_->parent()->MoveChildToFront(active_window_);
+    active_window_->parent()->StackChildAtTop(active_window_);
     if (active_window_->delegate())
       active_window_->delegate()->OnActivated();
     active_window_->GetFocusManager()->SetFocusedWindow(
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 70040fa..c58205f 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -183,13 +183,13 @@ void Window::SetParent(Window* parent) {
     NOTREACHED();
 }
 
-void Window::MoveChildToFront(Window* child) {
+void Window::StackChildAtTop(Window* child) {
   if (children_.size() <= 1 || child == children_.back())
     return;  // In the front already.
-  MoveChildAbove(child, children_.back());
+  StackChildAbove(child, children_.back());
 }
 
-void Window::MoveChildAbove(Window* child, Window* other) {
+void Window::StackChildAbove(Window* child, Window* other) {
   DCHECK_NE(child, other);
   DCHECK(child);
   DCHECK(other);
@@ -208,16 +208,16 @@ void Window::MoveChildAbove(Window* child, Window* other) {
   children_.insert(children_.begin() + other_i, child);
 
   // Reorder the layer.
-  layer()->MoveAbove(child->layer(), other->layer());
+  layer()->StackAbove(child->layer(), other->layer());
 
-  // Move any transient children that share the same parent to be in front of
+  // Stack any transient children that share the same parent to be in front of
   // 'child'.
   Window* last_transient = child;
   for (Windows::iterator i = child->transient_children_.begin();
        i != child->transient_children_.end(); ++i) {
     Window* transient_child = *i;
     if (transient_child->parent_ == this) {
-      MoveChildAbove(transient_child, last_transient);
+      StackChildAbove(transient_child, last_transient);
       last_transient = transient_child;
     }
   }
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 7feae05..9e1f05f 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -128,12 +128,12 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
   // the desktop's window.
   void SetParent(Window* parent);
 
-  // Move the specified child of this Window to the front of the z-order.
-  void MoveChildToFront(Window* child);
+  // Stacks the specified child of this Window at the front of the z-order.
+  void StackChildAtTop(Window* child);
 
-  // Moves |other| to be above |child|. Does nothing if |child| is already above
+  // Stacks |child| above |other|.  Does nothing if |child| is already above
   // |other|.
-  void MoveChildAbove(Window* child, Window* other);
+  void StackChildAbove(Window* child, Window* other);
 
   // Returns true if this window can be activated.
   bool CanActivate() const;
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index fe965a2..a74c9b2 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -244,8 +244,8 @@ TEST_F(WindowTest, DestroyTest) {
   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);
@@ -262,7 +262,7 @@ TEST_F(WindowTest, MoveChildToFront) {
   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]);
@@ -271,8 +271,8 @@ TEST_F(WindowTest, MoveChildToFront) {
   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);
@@ -286,7 +286,7 @@ TEST_F(WindowTest, MoveToFront) {
   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]);
@@ -297,7 +297,7 @@ TEST_F(WindowTest, MoveToFront) {
   // 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]);
@@ -308,7 +308,7 @@ TEST_F(WindowTest, MoveToFront) {
   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]);
@@ -754,8 +754,8 @@ TEST_F(WindowTest, TransientChildren) {
   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());
 
@@ -768,10 +768,10 @@ TEST_F(WindowTest, TransientChildren) {
   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]);
diff --git a/ui/aura_shell/modal_container_layout_manager.cc b/ui/aura_shell/modal_container_layout_manager.cc
index 3d0aae1..7961499 100644
--- a/ui/aura_shell/modal_container_layout_manager.cc
+++ b/ui/aura_shell/modal_container_layout_manager.cc
@@ -135,7 +135,7 @@ bool ModalContainerLayoutManager::CanWindowReceiveEvents(
 void ModalContainerLayoutManager::AddModalWindow(aura::Window* window) {
   modal_windows_.push_back(window);
   CreateModalScreen();
-  container_->MoveChildToFront(window);
+  container_->StackChildAtTop(window);
   window->Activate();
 }
 
@@ -172,7 +172,7 @@ void ModalContainerLayoutManager::CreateModalScreen() {
       modal_screen_->GetNativeView()->layer()->GetAnimator());
   modal_screen_->Show();
   modal_screen_->GetNativeView()->layer()->SetOpacity(0.5f);
-  container_->MoveChildToFront(modal_screen_->GetNativeView());
+  container_->StackChildAtTop(modal_screen_->GetNativeView());
 }
 
 void ModalContainerLayoutManager::DestroyModalScreen() {
diff --git a/ui/aura_shell/shadow_controller.cc b/ui/aura_shell/shadow_controller.cc
index 37f2a7d..0cfd442 100644
--- a/ui/aura_shell/shadow_controller.cc
+++ b/ui/aura_shell/shadow_controller.cc
@@ -132,11 +132,11 @@ void ShadowController::StackShadowBelowWindow(Shadow* shadow,
   ui::Layer* parent_layer = window->parent()->layer();
   DCHECK_EQ(shadow->layer()->parent(), parent_layer);
 
-  // TODO(derat): Add a MoveBelow() method and use that instead (although we
+  // TODO(derat): Add a StackBelow() method and use that instead (although we
   // then run the risk of other layers getting stacked between a window and its
   // shadow).
-  parent_layer->MoveAbove(shadow->layer(), window->layer());
-  parent_layer->MoveAbove(window->layer(), shadow->layer());
+  parent_layer->StackAbove(shadow->layer(), window->layer());
+  parent_layer->StackAbove(window->layer(), shadow->layer());
 }
 
 }  // namespace internal
diff --git a/ui/aura_shell/toplevel_window_event_filter.cc b/ui/aura_shell/toplevel_window_event_filter.cc
index 4da437c..d6e996c 100644
--- a/ui/aura_shell/toplevel_window_event_filter.cc
+++ b/ui/aura_shell/toplevel_window_event_filter.cc
@@ -173,7 +173,7 @@ void ToplevelWindowEventFilter::MoveWindowToFront(aura::Window* target) {
   aura::Window* parent = target->parent();
   aura::Window* child = target;
   while (parent) {
-    parent->MoveChildToFront(child);
+    parent->StackChildAtTop(child);
     if (parent == owner())
       break;
     parent = parent->parent();
diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc
index 109771ef..26e2699 100644
--- a/ui/gfx/compositor/layer.cc
+++ b/ui/gfx/compositor/layer.cc
@@ -123,15 +123,15 @@ void Layer::Remove(Layer* child) {
   child->DropTextures();
 }
 
-void Layer::MoveToFront(Layer* child) {
+void Layer::StackAtTop(Layer* child) {
   if (children_.size() <= 1 || child == children_.back())
     return;  // Already in front.
-  MoveAbove(child, children_.back());
+  StackAbove(child, children_.back());
 
   SetNeedsToRecomputeHole();
 }
 
-void Layer::MoveAbove(Layer* child, Layer* other) {
+void Layer::StackAbove(Layer* child, Layer* other) {
   DCHECK_NE(child, other);
   DCHECK_EQ(this, child->parent());
   DCHECK_EQ(this, other->parent());
diff --git a/ui/gfx/compositor/layer.h b/ui/gfx/compositor/layer.h
index 47b6a55..19949a1 100644
--- a/ui/gfx/compositor/layer.h
+++ b/ui/gfx/compositor/layer.h
@@ -69,12 +69,12 @@ class COMPOSITOR_EXPORT Layer :
   // Removes a Layer from this Layer.
   void Remove(Layer* child);
 
-  // Moves a child to the end of the child list.
-  void MoveToFront(Layer* child);
+  // Stacks |child| above all other children.
+  void StackAtTop(Layer* child);
 
-  // Moves |child| to be above |other|. Does nothing if |other| is already above
-  // |child|.
-  void MoveAbove(Layer* child, Layer* other);
+  // Stacks |child| above |other|, both of which must be children of this layer.
+  // Does nothing if |other| is already above |child|.
+  void StackAbove(Layer* child, Layer* other);
 
   // Returns the child Layers.
   const std::vector<Layer*>& children() const { return children_; }
diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc
index d9203ad..2e96cca 100644
--- a/ui/gfx/compositor/layer_unittest.cc
+++ b/ui/gfx/compositor/layer_unittest.cc
@@ -1243,7 +1243,7 @@ TEST_F(LayerWithRealCompositorTest, MAYBE_ModifyHierarchy) {
   // WritePNGFile(bitmap, ref_img1);
   EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img1));
 
-  l0->MoveToFront(l11.get());
+  l0->StackAtTop(l11.get());
   DrawTree(l0.get());
   ASSERT_TRUE(ReadPixels(&bitmap));
   ASSERT_FALSE(bitmap.empty());
@@ -1251,21 +1251,21 @@ TEST_F(LayerWithRealCompositorTest, MAYBE_ModifyHierarchy) {
   EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2));
 
   // l11 is already at the front, should have no effect.
-  l0->MoveToFront(l11.get());
+  l0->StackAtTop(l11.get());
   DrawTree(l0.get());
   ASSERT_TRUE(ReadPixels(&bitmap));
   ASSERT_FALSE(bitmap.empty());
   EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2));
 
   // l11 is already at the front, should have no effect.
-  l0->MoveAbove(l11.get(), l12.get());
+  l0->StackAbove(l11.get(), l12.get());
   DrawTree(l0.get());
   ASSERT_TRUE(ReadPixels(&bitmap));
   ASSERT_FALSE(bitmap.empty());
   EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2));
 
   // should restore to original configuration
-  l0->MoveAbove(l12.get(), l11.get());
+  l0->StackAbove(l12.get(), l11.get());
   DrawTree(l0.get());
   ASSERT_TRUE(ReadPixels(&bitmap));
   ASSERT_FALSE(bitmap.empty());
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index c60ab07..d8859c0 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -354,13 +354,13 @@ void NativeWidgetAura::SetSize(const gfx::Size& size) {
   window_->SetBounds(gfx::Rect(window_->bounds().origin(), size));
 }
 
-void NativeWidgetAura::MoveAbove(gfx::NativeView native_view) {
+void NativeWidgetAura::StackAbove(gfx::NativeView native_view) {
   if (window_->parent() && window_->parent() == native_view->parent())
-    window_->parent()->MoveChildAbove(window_, native_view);
+    window_->parent()->StackChildAbove(window_, native_view);
 }
 
-void NativeWidgetAura::MoveToTop() {
-  window_->parent()->MoveChildToFront(window_);
+void NativeWidgetAura::StackAtTop() {
+  window_->parent()->StackChildAtTop(window_);
 }
 
 void NativeWidgetAura::SetShape(gfx::NativeRegion region) {
diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h
index 57c2405..7791cc3 100644
--- a/ui/views/widget/native_widget_aura.h
+++ b/ui/views/widget/native_widget_aura.h
@@ -82,8 +82,8 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual void SetSize(const gfx::Size& size) OVERRIDE;
-  virtual void MoveAbove(gfx::NativeView native_view) OVERRIDE;
-  virtual void MoveToTop() OVERRIDE;
+  virtual void StackAbove(gfx::NativeView native_view) OVERRIDE;
+  virtual void StackAtTop() OVERRIDE;
   virtual void SetShape(gfx::NativeRegion shape) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void CloseNow() OVERRIDE;
diff --git a/ui/views/widget/native_widget_gtk.cc b/ui/views/widget/native_widget_gtk.cc
index 5209be8..2d6556f 100644
--- a/ui/views/widget/native_widget_gtk.cc
+++ b/ui/views/widget/native_widget_gtk.cc
@@ -1143,11 +1143,11 @@ void NativeWidgetGtk::SetSize(const gfx::Size& size) {
   }
 }
 
-void NativeWidgetGtk::MoveAbove(gfx::NativeView native_view) {
+void NativeWidgetGtk::StackAbove(gfx::NativeView native_view) {
   ui::StackPopupWindow(GetNativeView(), native_view);
 }
 
-void NativeWidgetGtk::MoveToTop() {
+void NativeWidgetGtk::StackAtTop() {
   DCHECK(GTK_IS_WINDOW(GetNativeView()));
   gtk_window_present(GTK_WINDOW(GetNativeView()));
 }
diff --git a/ui/views/widget/native_widget_gtk.h b/ui/views/widget/native_widget_gtk.h
index f216e66..327edb3 100644
--- a/ui/views/widget/native_widget_gtk.h
+++ b/ui/views/widget/native_widget_gtk.h
@@ -185,8 +185,8 @@ class VIEWS_EXPORT NativeWidgetGtk : public internal::NativeWidgetPrivate,
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual void SetSize(const gfx::Size& size) OVERRIDE;
-  virtual void MoveAbove(gfx::NativeView native_view) OVERRIDE;
-  virtual void MoveToTop() OVERRIDE;
+  virtual void StackAbove(gfx::NativeView native_view) OVERRIDE;
+  virtual void StackAtTop() OVERRIDE;
   virtual void SetShape(gfx::NativeRegion shape) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void CloseNow() OVERRIDE;
diff --git a/ui/views/widget/native_widget_private.h b/ui/views/widget/native_widget_private.h
index 702cf8b..a5702c3 100644
--- a/ui/views/widget/native_widget_private.h
+++ b/ui/views/widget/native_widget_private.h
@@ -167,8 +167,8 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget,
   virtual gfx::Rect GetRestoredBounds() const = 0;
   virtual void SetBounds(const gfx::Rect& bounds) = 0;
   virtual void SetSize(const gfx::Size& size) = 0;
-  virtual void MoveAbove(gfx::NativeView native_view) = 0;
-  virtual void MoveToTop() = 0;
+  virtual void StackAbove(gfx::NativeView native_view) = 0;
+  virtual void StackAtTop() = 0;
   virtual void SetShape(gfx::NativeRegion shape) = 0;
   virtual void Close() = 0;
   virtual void CloseNow() = 0;
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index f969932..d49b5fe 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -711,12 +711,12 @@ void NativeWidgetWin::SetSize(const gfx::Size& size) {
                SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
 }
 
-void NativeWidgetWin::MoveAbove(gfx::NativeView native_view) {
+void NativeWidgetWin::StackAbove(gfx::NativeView native_view) {
   SetWindowPos(native_view, 0, 0, 0, 0,
                SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
 }
 
-void NativeWidgetWin::MoveToTop() {
+void NativeWidgetWin::StackAtTop() {
   NOTIMPLEMENTED();
 }
 
diff --git a/ui/views/widget/native_widget_win.h b/ui/views/widget/native_widget_win.h
index 3e77310..4cd53b6 100644
--- a/ui/views/widget/native_widget_win.h
+++ b/ui/views/widget/native_widget_win.h
@@ -220,8 +220,8 @@ class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl,
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual void SetSize(const gfx::Size& size) OVERRIDE;
-  virtual void MoveAbove(gfx::NativeView native_view) OVERRIDE;
-  virtual void MoveToTop() OVERRIDE;
+  virtual void StackAbove(gfx::NativeView native_view) OVERRIDE;
+  virtual void StackAtTop() OVERRIDE;
   virtual void SetShape(gfx::NativeRegion shape) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void CloseNow() OVERRIDE;
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 92801e5..fc610c4 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -442,16 +442,16 @@ void Widget::SetBoundsConstrained(const gfx::Rect& bounds) {
   }
 }
 
-void Widget::MoveAboveWidget(Widget* widget) {
-  native_widget_->MoveAbove(widget->GetNativeView());
+void Widget::StackAboveWidget(Widget* widget) {
+  native_widget_->StackAbove(widget->GetNativeView());
 }
 
-void Widget::MoveAbove(gfx::NativeView native_view) {
-  native_widget_->MoveAbove(native_view);
+void Widget::StackAbove(gfx::NativeView native_view) {
+  native_widget_->StackAbove(native_view);
 }
 
-void Widget::MoveToTop() {
-  native_widget_->MoveToTop();
+void Widget::StackAtTop() {
+  native_widget_->StackAtTop();
 }
 
 void Widget::SetShape(gfx::NativeRegion shape) {
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 128a0aa..eed8f18 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -305,9 +305,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   void SetBoundsConstrained(const gfx::Rect& bounds);
 
   // Places the widget in front of the specified widget in z-order.
-  void MoveAboveWidget(Widget* widget);
-  void MoveAbove(gfx::NativeView native_view);
-  void MoveToTop();
+  void StackAboveWidget(Widget* widget);
+  void StackAbove(gfx::NativeView native_view);
+  void StackAtTop();
 
   // Sets a shape on the widget. This takes ownership of shape.
   void SetShape(gfx::NativeRegion shape);