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

ash/shelf/shelf_view.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_VIEW_H_
 #define ASH_SHELF_SHELF_VIEW_H_
 
 #include <utility>
 #include <vector>
 
 #include "ash/shelf/shelf_button_host.h"
 #include "ash/shelf/shelf_model_observer.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
 #include "base/observer_list.h"
 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
 #include "ui/views/animation/bounds_animator_observer.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
+#include "ui/views/view_model.h"
 
 namespace ui {
 class MenuModel;
 }
 
 namespace views {
 class BoundsAnimator;
 class MenuRunner;
-class ViewModel;
 }
 
 namespace ash {
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfItemDelegateManager;
 class ShelfModel;
 struct ShelfItem;
 class DragImageView;
 class OverflowBubble;
@@ skipping 86 matching lines @@
   virtual void UpdateDragIconProxy(
       const gfx::Point& location_in_screen_coordinates) OVERRIDE;
   virtual void DestroyDragIconProxy() OVERRIDE;
   virtual bool StartDrag(
       const std::string& app_id,
       const gfx::Point& location_in_screen_coordinates) OVERRIDE;
   virtual bool Drag(const gfx::Point& location_in_screen_coordinates) OVERRIDE;
   virtual void EndDrag(bool cancel) OVERRIDE;
 
   // Return the view model for test purposes.
-  const views::ViewModel* view_model_for_test() const {
+  const views::ViewModel<views::View>* view_model_for_test() const {
     return view_model_.get();
   }
 
  private:
   friend class ash::test::ShelfViewTestAPI;
 
   class FadeOutAnimationDelegate;
   class StartFadeAnimationDelegate;
 
   struct IdealBounds {
@@ skipping 177 matching lines @@
   int CalculateShelfDistance(const gfx::Point& coordinate) const;
 
   // The model; owned by Launcher.
   ShelfModel* model_;
 
   // Delegate; owned by Launcher.
   ShelfDelegate* delegate_;
 
   // Used to manage the set of active launcher buttons. There is a view per
   // item in |model_|.
-  scoped_ptr<views::ViewModel> view_model_;
+  scoped_ptr<views::ViewModel<views::View>> view_model_;
 
   // Index of first visible launcher item.
   int first_visible_index_;
 
   // Last index of a launcher button that is visible
   // (does not go into overflow).
   mutable int last_visible_index_;
 
   scoped_ptr<views::BoundsAnimator> bounds_animator_;
 
@@ skipping 94 matching lines @@
 
   // True when ripped item from overflow bubble is entered into Shelf.
   bool dragged_off_from_overflow_to_shelf_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_