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

chrome/browser/ui/views/tabs/stacked_tab_strip_layout.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 CHROME_BROWSER_UI_VIEWS_TABS_STACKED_TAB_STRIP_LAYOUT_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_STACKED_TAB_STRIP_LAYOUT_H_
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "ui/gfx/size.h"
 #include "ui/views/view_model.h"
 
-namespace views {
-class ViewModel;
-}
+class Tab;
 
 // StackedTabStripLayout is used by TabStrip in touch
 // mode. StackedTabStripLayout is responsible for managing the bounds of the
 // tabs. StackedTabStripLayout differs from the normal layout in that it stacks
 // tabs. Stacked tabs are tabs placed nearly on top of each other, and if enough
 // consecutive stacked tabs exist they are placed on top of each other. Normally
 // stacked tabs are placed after mini-tabs, or at the end of the tabstrip, but
 // during dragging tabs may be stacked before or after the active tab.
 class StackedTabStripLayout {
  public:
   static const int kAddTypeMini   = 1 << 0;
   static const int kAddTypeActive = 1 << 1;
 
   // |size| is the size for tabs, |padding| the padding between consecutive
   // tabs, |stacked_padding| the padding between stacked tabs,
   // |max_stacked_count| the maximum number of consecutive tabs that can be
   // stacked before they are placed on top of each other, |view_model| is the
   // ViewModel the bounds of the tabs are placed in.
   StackedTabStripLayout(const gfx::Size& size,
                         int padding,
                         int stacked_padding,
                         int max_stacked_count,
-                        views::ViewModel* view_model);
+                        views::ViewModelBase* view_model);
   ~StackedTabStripLayout();
 
   // Sets the x-coordinate the normal tabs start at as well as the mini-tab
   // count. This is only useful if the mini-tab count or x-coordinate change.
   void SetXAndMiniCount(int x, int mini_tab_count);
 
   // Sets the width available for sizing the tabs to.
   void SetWidth(int width);
 
   int width() const { return width_; }
@@ skipping 160 matching lines @@
   // Padding between tabs.
   const int padding_;
 
   // Padding between stacked tabs.
   const int stacked_padding_;
 
   // Max number of stacked tabs.
   const int max_stacked_count_;
 
   // Where bounds are placed. This is owned by TabStrip.
-  views::ViewModel* view_model_;
+  // (Note: This is a ViewModelBase, not a ViewModelT<Tab>, because the tests do
+  // not populate the model with Tab views.)
+  views::ViewModelBase* view_model_;
 
   // x-coordinate normal tabs start at.
   int x_;
 
   // Available width.
   int width_;
 
   // Number of mini-tabs.
   int mini_tab_count_;
 
   // Distance from the last mini-tab to the first non-mini-tab.
   int mini_tab_to_non_mini_tab_;
 
   // Index of the active tab.
   int active_index_;
 
   // X-coordinate of the first tab. This is either |x_| if there are no
   // mini-tabs, or the x-coordinate of the first mini-tab.
   int first_tab_x_;
 
   DISALLOW_COPY_AND_ASSIGN(StackedTabStripLayout);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_STACKED_TAB_STRIP_LAYOUT_H_