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

is a ton of rough edges after this patch, but I don't want this patch
to get any bigger.

BUG=121962
TEST=covered by tests.
R=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10388036

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

1 files changed, 9 insertions, 2 deletions

diff --git a/ui/views/view_model_utils.h b/ui/views/view_model_utils.h
index d7f8bd3..2993aaa 100644
--- a/ui/views/view_model_utils.h
+++ b/ui/views/view_model_utils.h
@@ -16,16 +16,23 @@ class ViewModel;
 
 class VIEWS_EXPORT ViewModelUtils {
  public:
+  enum Alignment {
+    HORIZONTAL,
+    VERTICAL
+  };
+
   // Sets the bounds of each view to its ideal bounds.
   static void SetViewBoundsToIdealBounds(const ViewModel& model);
 
   // Returns true if the Views in |model| are at their ideal bounds.
   static bool IsAtIdealBounds(const ViewModel& model);
 
-  // Returns the index to move |view| to based on a x-coordinate of |x|.
+  // Returns the index to move |view| to based on a coordinate of |x| and |y|.
   static int DetermineMoveIndex(const ViewModel& model,
                                 View* view,
-                                int x);
+                                Alignment alignment,
+                                int x,
+                                int y);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ViewModelUtils);