Adds Window::MoveChildToFront, with surrounding changes.

ui/aura/window.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 <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 155 matching lines @@
 void Window::SetParent(Window* parent) {
   if (parent)
     parent->AddChild(this);
   else if (Desktop::GetInstance()->delegate())
     Desktop::GetInstance()->delegate()->AddChildToDefaultParent(this);
   else
     NOTREACHED();
 }
 
 void Window::MoveChildToFront(Window* child) {
-  DCHECK_EQ(child->parent(), this);
-  const Windows::iterator i(std::find(children_.begin(), children_.end(),
-                                      child));
-  DCHECK(i != children_.end());
-  children_.erase(i);
+  if (children_.size() <= 1 || child == children_.back())
+    return;  // In the front already.
+  MoveChildAbove(child, children_.back());
+}
 
-  children_.insert(children_.begin() + children_.size(), child);
-  child->layer()->parent()->MoveToFront(child->layer());
-  // Repaint the window as active status may have changed.
-  SchedulePaintInRect(gfx::Rect());
+void Window::MoveChildAbove(Window* child, Window* other) {
+  DCHECK_NE(child, other);
+  DCHECK(child);
+  DCHECK(other);
+  DCHECK_EQ(this, child->parent());
+  DCHECK_EQ(this, other->parent());
+
+  size_t child_i =
+      std::find(children_.begin(), children_.end(), child) - children_.begin();
+  size_t other_i =
+      std::find(children_.begin(), children_.end(), other) - children_.begin();
+  if (child_i > other_i)
+    return;  // Already in front of |other|.
+
+  // Reorder children.
+  children_.erase(children_.begin() + child_i);
+  children_.insert(children_.begin() + other_i, child);
+
+  // Reorder the layer.
+  layer()->MoveAbove(child->layer(), other->layer());
 
   // Move any transient children that share the same parent to be in front of
-  // us.
+  // '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)
-      MoveChildToFront(transient_child);
+    if (transient_child->parent_ == this) {
+      MoveChildAbove(transient_child, last_transient);
+      last_transient = transient_child;
+    }
   }
 }
 
 bool Window::CanActivate() const {
   return IsVisible() && delegate_ && delegate_->ShouldActivate(NULL);
 }
 
 void Window::AddChild(Window* child) {
   DCHECK(std::find(children_.begin(), children_.end(), child) ==
       children_.end());
@@ skipping 270 matching lines @@
   }
 
   return delegate_ ? this : NULL;
 }
 
 void Window::OnPaintLayer(gfx::Canvas* canvas) {
   delegate_->OnPaint(canvas);
 }
 
 }  // namespace aura