Added views::ViewModelT<T>, a type-safe template version of ViewModel.

ui/views/view_model_utils.cc

Index: ui/views/view_model_utils.cc
diff --git a/ui/views/view_model_utils.cc b/ui/views/view_model_utils.cc
deleted file mode 100644
index 056e75b8a7fa1620c69dbee233e5d2242dc97e2b..0000000000000000000000000000000000000000
--- a/ui/views/view_model_utils.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// 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 <algorithm>
-
-#include "ui/views/view.h"
-#include "ui/views/view_model.h"
-
-namespace views {
-
-namespace {
-
-// Used in calculating ideal bounds.
-int primary_axis_coordinate(ViewModelUtils::Alignment alignment,
-                            int x,
-                            int y) {
-  return alignment == ViewModelUtils::HORIZONTAL ? x : y;
-}
-
-}  // namespace
-
-// static
-void ViewModelUtils::SetViewBoundsToIdealBounds(const ViewModel& model) {
-  for (int i = 0; i < model.view_size(); ++i)
-    model.view_at(i)->SetBoundsRect(model.ideal_bounds(i));
-}
-
-// static
-bool ViewModelUtils::IsAtIdealBounds(const ViewModel& model) {
-  for (int i = 0; i < model.view_size(); ++i) {
-    View* view = model.view_at(i);
-    if (view->bounds() != model.ideal_bounds(i))
-      return false;
-  }
-  return true;
-}
-
-// static
-int ViewModelUtils::DetermineMoveIndex(const ViewModel& model,
-                                       View* view,
-                                       Alignment alignment,
-                                       int x,
-                                       int y) {
-  int value = primary_axis_coordinate(alignment, x, y);
-  int current_index = model.GetIndexOfView(view);
-  DCHECK_NE(-1, current_index);
-  for (int i = 0; i < current_index; ++i) {
-    int mid_point = primary_axis_coordinate(
-        alignment,
-        model.ideal_bounds(i).x() + model.ideal_bounds(i).width() / 2,
-        model.ideal_bounds(i).y() + model.ideal_bounds(i).height() / 2);
-    if (value < mid_point)
-      return i;
-  }
-
-  if (current_index + 1 == model.view_size())
-    return current_index;
-
-  // For indices after the current index ignore the bounds of the view being
-  // dragged. This keeps the view from bouncing around as moved.
-  int delta = primary_axis_coordinate(
-      alignment,
-      model.ideal_bounds(current_index + 1).x() -
-      model.ideal_bounds(current_index).x(),
-      model.ideal_bounds(current_index + 1).y() -
-      model.ideal_bounds(current_index).y());
-  for (int i = current_index + 1; i < model.view_size(); ++i) {
-    const gfx::Rect& bounds(model.ideal_bounds(i));
-    int mid_point = primary_axis_coordinate(
-        alignment,
-        bounds.x() + bounds.width() / 2 - delta,
-        bounds.y() + bounds.height() / 2 - delta);
-    if (value < mid_point)
-      return i - 1;
-  }
-  return model.view_size() - 1;
-}
-
-}  // namespace views