Chromium Code Reviews| 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 eb2ec6def49adf394a4e3b631d4014cc05660ad2..772c41b8a0cca4165f1a7e17a5f8dfc0514fe8db 100644 |
| --- a/ui/app_list/views/contents_view.h |
| +++ b/ui/app_list/views/contents_view.h |
| @@ -29,6 +29,7 @@ class AppListModel; |
| class AppListViewDelegate; |
| class AppsContainerView; |
| class PaginationModel; |
| +class StartPageView; |
| // A view to manage sub views under the search box (apps grid view + page |
| // switcher and search results). The two sets of sub views are mutually |
| @@ -36,7 +37,11 @@ class PaginationModel; |
| // and animates the transition between show states. |
| class ContentsView : public views::View { |
| public: |
| - enum ShowState { SHOW_APPS, SHOW_SEARCH_RESULTS, }; |
| + enum ShowState { |
| + SHOW_APPS, |
| + SHOW_SEARCH_RESULTS, |
| + SHOW_START_PAGE, |
| + }; |
| ContentsView(AppListMainView* app_list_main_view, |
| PaginationModel* pagination_model, |
| @@ -62,6 +67,8 @@ class ContentsView : public views::View { |
| AppsContainerView* apps_container_view() { return apps_container_view_; } |
| + ShowState show_state() { return show_state_; } |
|
xiyuan
2014/05/09 07:59:46
nit: make it a const method:
i.e. ShowState show_s
calamity
2014/05/12 03:00:42
Done.
|
| + |
| // Overridden from views::View: |
| virtual gfx::Size GetPreferredSize() OVERRIDE; |
| virtual void Layout() OVERRIDE; |
| @@ -83,6 +90,7 @@ class ContentsView : public views::View { |
| PaginationModel* pagination_model_; // Owned by AppListController. |
| AppsContainerView* apps_container_view_; // Owned by the views hierarchy. |
| + AppListMainView* app_list_main_view_; // Parent view, owns this. |
| scoped_ptr<views::ViewModel> view_model_; |
| scoped_ptr<views::BoundsAnimator> bounds_animator_; |