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

ui/views/view_model_utils.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 <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) {
+void ViewModelUtils::SetViewBoundsToIdealBounds(const ViewModelBase& model) {
   for (int i = 0; i < model.view_size(); ++i)
-    model.view_at(i)->SetBoundsRect(model.ideal_bounds(i));
+    model.ViewAtBase(i)->SetBoundsRect(model.ideal_bounds(i));
 }
 
 // static
-bool ViewModelUtils::IsAtIdealBounds(const ViewModel& model) {
+bool ViewModelUtils::IsAtIdealBounds(const ViewModelBase& model) {
   for (int i = 0; i < model.view_size(); ++i) {
-    View* view = model.view_at(i);
+    View* view = model.ViewAtBase(i);
     if (view->bounds() != model.ideal_bounds(i))
       return false;
   }
   return true;
 }
 
 // static
-int ViewModelUtils::DetermineMoveIndex(const ViewModel& model,
+int ViewModelUtils::DetermineMoveIndex(const ViewModelBase& 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,
@@ skipping 20 matching lines @@
         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