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

ash/shelf/shelf_view.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 "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 204 matching lines @@
 }
 
 bool ShelfMenuModelAdapter::ShouldReserveSpaceForSubmenuIndicator() const {
   return false;
 }
 
 // Custom FocusSearch used to navigate the shelf in the order items are in
 // the ViewModel.
 class ShelfFocusSearch : public views::FocusSearch {
  public:
-  explicit ShelfFocusSearch(views::ViewModel* view_model)
+  explicit ShelfFocusSearch(views::ViewModel<views::View>* view_model)
       : FocusSearch(NULL, true, true),
         view_model_(view_model) {}
   virtual ~ShelfFocusSearch() {}
 
   // views::FocusSearch overrides:
   virtual View* FindNextFocusableView(
       View* starting_view,
       bool reverse,
       Direction direction,
       bool check_starting_view,
       views::FocusTraversable** focus_traversable,
       View** focus_traversable_view) OVERRIDE {
     int index = view_model_->GetIndexOfView(starting_view);
     if (index == -1)
       return view_model_->view_at(0);
 
     if (reverse) {
       --index;
       if (index < 0)
         index = view_model_->view_size() - 1;
     } else {
       ++index;
       if (index >= view_model_->view_size())
         index = 0;
     }
     return view_model_->view_at(index);
   }
 
  private:
-  views::ViewModel* view_model_;
+  views::ViewModel<views::View>* view_model_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfFocusSearch);
 };
 
 // AnimationDelegate used when inserting a new item. This steadily increases the
 // opacity of the layer as the animation progress.
 class FadeInAnimationDelegate : public gfx::AnimationDelegate {
  public:
   explicit FadeInAnimationDelegate(views::View* view) : view_(view) {}
   virtual ~FadeInAnimationDelegate() {}
@@ skipping 96 matching lines @@
   views::View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(StartFadeAnimationDelegate);
 };
 
 ShelfView::ShelfView(ShelfModel* model,
                      ShelfDelegate* delegate,
                      ShelfLayoutManager* manager)
     : model_(model),
       delegate_(delegate),
-      view_model_(new views::ViewModel),
+      view_model_(new views::ViewModel<views::View>),
       first_visible_index_(0),
       last_visible_index_(-1),
       overflow_button_(NULL),
       owner_overflow_bubble_(NULL),
       drag_pointer_(NONE),
       drag_view_(NULL),
       start_drag_index_(-1),
       context_menu_id_(0),
       leading_inset_(kDefaultLeadingInset),
       cancelling_drag_model_changed_(false),
@@ skipping 1544 matching lines @@
       distance = bounds.x() - coordinate.x();
       break;
     case SHELF_ALIGNMENT_TOP:
       distance = coordinate.y() - bounds.bottom();
       break;
   }
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash