Add View::ReorderChildView and Widget::MoveToTop.

views/view_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 <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/clipboard/clipboard.h"
@@ skipping 2093 matching lines @@
   ASSERT_EQ(-1, child1->GetIndexOf(child2));
   ASSERT_EQ(0, child1->GetIndexOf(foo1));
 
   ASSERT_EQ(-1, child2->GetIndexOf(NULL));
   ASSERT_EQ(-1, child2->GetIndexOf(&root));
   ASSERT_EQ(-1, child2->GetIndexOf(child2));
   ASSERT_EQ(-1, child2->GetIndexOf(child1));
   ASSERT_EQ(-1, child2->GetIndexOf(foo1));
 }
 
+// Verifies that the child views can be reordered correctly.
+TEST_F(ViewTest, ReorderChildren) {

[tfarina, 2011/06/16 16:18:24]

I'd add a comment like this (but it's OK to not too):

// The tree looks like this:
// root
// |-- child
// |   |-- foo1
// |   |-- foo2
// +---|-- foo3

[sadrul, 2011/06/16 16:25:01]

I think the view hierarchy is pretty self-evident, and since the hierarchy is
changed a lot of time, it probably doesn't make sense to draw the hierarchy :)

[Ben Goodger (Google), 2011/06/16 16:25:06]

I think you mean:

On 2011/06/16 16:18:24, tfarina wrote:
... though I'm not sure a tree this shallow needs a diagram.

[tfarina, 2011/06/16 16:28:12]

Sure, that why I said I'm OK to not have one. It's just a hint for me and for
any further reader to know instantly (without having to guess/read from the
code) how the tree we're testing looks like.

+  View root;
+
+  View* child = new View();
+  root.AddChildView(child);
+
+  View* foo1 = new View();
+  child->AddChildView(foo1);
+  View* foo2 = new View();
+  child->AddChildView(foo2);
+  View* foo3 = new View();
+  child->AddChildView(foo3);
+  foo1->set_focusable(true);
+  foo2->set_focusable(true);
+  foo3->set_focusable(true);
+
+  ASSERT_EQ(0, child->GetIndexOf(foo1));
+  ASSERT_EQ(1, child->GetIndexOf(foo2));
+  ASSERT_EQ(2, child->GetIndexOf(foo3));
+  ASSERT_EQ(foo2, foo1->GetNextFocusableView());
+  ASSERT_EQ(foo3, foo2->GetNextFocusableView());
+  ASSERT_EQ(NULL, foo3->GetNextFocusableView());
+
+  // Move |foo2| at the end.
+  child->ReorderChildView(foo2, -1);
+  ASSERT_EQ(0, child->GetIndexOf(foo1));
+  ASSERT_EQ(1, child->GetIndexOf(foo3));
+  ASSERT_EQ(2, child->GetIndexOf(foo2));
+  ASSERT_EQ(foo3, foo1->GetNextFocusableView());
+  ASSERT_EQ(foo2, foo3->GetNextFocusableView());
+  ASSERT_EQ(NULL, foo2->GetNextFocusableView());
+
+  // Move |foo1| at the end.
+  child->ReorderChildView(foo1, -1);
+  ASSERT_EQ(0, child->GetIndexOf(foo3));
+  ASSERT_EQ(1, child->GetIndexOf(foo2));
+  ASSERT_EQ(2, child->GetIndexOf(foo1));
+  ASSERT_EQ(NULL, foo1->GetNextFocusableView());
+  ASSERT_EQ(foo2, foo1->GetPreviousFocusableView());
+  ASSERT_EQ(foo2, foo3->GetNextFocusableView());
+  ASSERT_EQ(foo1, foo2->GetNextFocusableView());
+
+  // Move |foo2| at the front.

[tfarina, 2011/06/16 16:18:24]

nit: at -> to?

[sadrul, 2011/06/16 16:25:01]

Done.

+  child->ReorderChildView(foo2, 0);
+  ASSERT_EQ(0, child->GetIndexOf(foo2));
+  ASSERT_EQ(1, child->GetIndexOf(foo3));
+  ASSERT_EQ(2, child->GetIndexOf(foo1));
+  ASSERT_EQ(NULL, foo1->GetNextFocusableView());
+  ASSERT_EQ(foo3, foo1->GetPreviousFocusableView());
+  ASSERT_EQ(foo3, foo2->GetNextFocusableView());
+  ASSERT_EQ(foo1, foo3->GetNextFocusableView());
+}
+
 }  // namespace views