| Index: ui/app_list/views/contents_view.h
|
| diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h
|
| index dbb74cf8d50c754e8ff572acad645d529abe3235..5e88d01d750646a1835a3848fcdeeb4996c464b8 100644
|
| --- a/ui/app_list/views/contents_view.h
|
| +++ b/ui/app_list/views/contents_view.h
|
| @@ -14,15 +14,12 @@
|
| #include "ui/app_list/pagination_model.h"
|
| #include "ui/app_list/pagination_model_observer.h"
|
| #include "ui/views/view.h"
|
| +#include "ui/views/view_model.h"
|
|
|
| namespace gfx {
|
| class Rect;
|
| }
|
|
|
| -namespace views {
|
| -class ViewModel;
|
| -}
|
| -
|
| namespace app_list {
|
|
|
| class AppsGridView;
|
| @@ -160,7 +157,7 @@ class APP_LIST_EXPORT ContentsView : public views::View,
|
| // Sibling view, owned by |app_list_main_view_|.
|
| ContentsSwitcherView* contents_switcher_view_;
|
|
|
| - scoped_ptr<views::ViewModel> view_model_;
|
| + scoped_ptr<views::ViewModel<views::View>> view_model_;
|
| // Maps NamedPage onto |view_model_| indices.
|
| std::map<NamedPage, int> named_page_to_view_;
|
|
|
|
|