| Index: chrome/browser/ui/views/tabs/tab_strip.h
|
| diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h
|
| index 34cc81004881c1a3c6a2ea5f8b30ce455ca94e34..f4fb10d1176a013e66148a5ae5acd6318219d629 100644
|
| --- a/chrome/browser/ui/views/tabs/tab_strip.h
|
| +++ b/chrome/browser/ui/views/tabs/tab_strip.h
|
| @@ -150,7 +150,7 @@ class TabStrip : public views::View,
|
|
|
| // Returns the Tab at |index|.
|
| Tab* tab_at(int index) const {
|
| - return static_cast<Tab*>(tabs_.view_at(index));
|
| + return tabs_.view_at(index);
|
| }
|
|
|
| // Returns the index of the specified tab in the model coordinate system, or
|
| @@ -596,7 +596,7 @@ class TabStrip : public views::View,
|
| // |tabs_closing_map_|. When the animation completes the tab is removed from
|
| // |tabs_closing_map_|. The painting code ensures both sets of tabs are
|
| // painted, and the event handling code ensures only tabs in |tabs_| are used.
|
| - views::ViewModel tabs_;
|
| + views::ViewModel<Tab> tabs_;
|
| TabsClosingMap tabs_closing_map_;
|
|
|
| scoped_ptr<TabStripController> controller_;
|
|
|