Adds the option of aligning the launcher to the left or right. There

ui/views/view_model_utils_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 "ui/views/view_model_utils.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/view.h"
 #include "ui/views/view_model.h"
 
@@ skipping 14 matching lines @@
 TEST(ViewModelUtils, DetermineMoveIndex) {
   View v1, v2, v3;
   ViewModel model;
   model.Add(&v1, 0);
   model.Add(&v2, 1);
   model.Add(&v3, 2);
   model.set_ideal_bounds(0, gfx::Rect(0, 0, 10, 10));
   model.set_ideal_bounds(1, gfx::Rect(10, 0, 1000, 10));
   model.set_ideal_bounds(2, gfx::Rect(1010, 0, 2, 10));
 
-  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(model, &v1, -10));
-  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(model, &v1, 4));
-  EXPECT_EQ(1, ViewModelUtils::DetermineMoveIndex(model, &v1, 506));
-  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(model, &v1, 1010));
-  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(model, &v1, 2000));
+  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::HORIZONTAL, -10, 0));
+  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::HORIZONTAL, 4, 0));
+  EXPECT_EQ(1, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::HORIZONTAL, 506, 0));
+  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::HORIZONTAL, 1010, 0));
+  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::HORIZONTAL, 2000, 0));
 
-  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(model, &v2, -10));
-  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(model, &v2, 4));
-  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(model, &v2, 12));
+  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(
+                model, &v2, ViewModelUtils::HORIZONTAL, -10, 0));
+  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(
+                model, &v2, ViewModelUtils::HORIZONTAL, 4, 0));
+  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(
+                model, &v2, ViewModelUtils::HORIZONTAL, 12, 0));
+
+  // Try the same when vertical.
+  model.set_ideal_bounds(0, gfx::Rect(0, 0, 10, 10));
+  model.set_ideal_bounds(1, gfx::Rect(0, 10, 10, 1000));
+  model.set_ideal_bounds(2, gfx::Rect(0, 1010, 10, 2));
+
+  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::VERTICAL, 0, -10));
+  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::VERTICAL, 0, 4));
+  EXPECT_EQ(1, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::VERTICAL, 0, 506));
+  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::VERTICAL, 0, 1010));
+  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(
+                model, &v1, ViewModelUtils::VERTICAL, 0, 2000));
+
+  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(
+                model, &v2, ViewModelUtils::VERTICAL, 0, -10));
+  EXPECT_EQ(0, ViewModelUtils::DetermineMoveIndex(
+                model, &v2, ViewModelUtils::VERTICAL, 0, 4));
+  EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(
+                model, &v2, ViewModelUtils::VERTICAL, 0, 12));
 }
 
 }  // namespace views