Move ContentsView::NamedPage to AppListModel::ShowState.

ui/app_list/views/contents_view.cc

Index: ui/app_list/views/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 71c0af55fcc367edfb5b25703c1f7415b1212a89..e556d4d73f197efea78a946845951f7e9da5e36c 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -45,8 +45,8 @@ ContentsView::~ContentsView() {
     pagination_model_.RemoveObserver(contents_switcher_view_);
 }
 
-void ContentsView::InitNamedPages(AppListModel* model,
-                                  AppListViewDelegate* view_delegate) {
+void ContentsView::Init(AppListModel* model,
+                        AppListViewDelegate* view_delegate) {
   DCHECK(model);
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
@@ -61,22 +61,23 @@ void ContentsView::InitNamedPages(AppListModel* model,
 
     start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
     AddLauncherPage(
-        start_page_view_, IDR_APP_LIST_SEARCH_ICON, NAMED_PAGE_START);
+        start_page_view_, IDR_APP_LIST_SEARCH_ICON, AppListModel::SHOW_START);
   } else {
     search_results_view_ =
         new SearchResultListView(app_list_main_view_, view_delegate);
-    AddLauncherPage(search_results_view_, 0, NAMED_PAGE_SEARCH_RESULTS);
+    AddLauncherPage(search_results_view_, 0, AppListModel::SHOW_SEARCH_RESULTS);
     search_results_view_->SetResults(model->results());
   }
 
   apps_container_view_ = new AppsContainerView(app_list_main_view_, model);
 
   AddLauncherPage(
-      apps_container_view_, IDR_APP_LIST_APPS_ICON, NAMED_PAGE_APPS);
+      apps_container_view_, IDR_APP_LIST_APPS_ICON, AppListModel::SHOW_APPS);
 
-  int initial_page_index = app_list::switches::IsExperimentalAppListEnabled()
-                               ? GetPageIndexForNamedPage(NAMED_PAGE_START)
-                               : GetPageIndexForNamedPage(NAMED_PAGE_APPS);
+  int initial_page_index =
+      app_list::switches::IsExperimentalAppListEnabled()
+          ? GetPageIndexForShowState(AppListModel::SHOW_START)
+          : GetPageIndexForShowState(AppListModel::SHOW_APPS);
   DCHECK_GE(initial_page_index, 0);
 
   page_before_search_ = initial_page_index;
@@ -119,17 +120,18 @@ int ContentsView::GetActivePageIndex() const {
   return pagination_model_.SelectedTargetPage();
 }
 
-bool ContentsView::IsNamedPageActive(NamedPage named_page) const {
+bool ContentsView::IsShowStateActive(AppListModel::ShowState show_state) const {
   int active_page_index = GetActivePageIndex();
   return active_page_index >= 0 &&
-         GetPageIndexForNamedPage(named_page) == active_page_index;
+         GetPageIndexForShowState(show_state) == active_page_index;
 }
 
-int ContentsView::GetPageIndexForNamedPage(NamedPage named_page) const {
-  // Find the index of the view corresponding to the given named_page.
-  std::map<NamedPage, int>::const_iterator it =
-      named_page_to_view_.find(named_page);
-  if (it == named_page_to_view_.end())
+int ContentsView::GetPageIndexForShowState(
+    AppListModel::ShowState show_state) const {
+  // Find the index of the view corresponding to the given show state.
+  std::map<AppListModel::ShowState, int>::const_iterator it =
+      show_state_to_view_.find(show_state);
+  if (it == show_state_to_view_.end())
     return -1;
 
   return it->second;
@@ -150,14 +152,14 @@ void ContentsView::SetActivePageInternal(int page_index,
 
 void ContentsView::ActivePageChanged(bool show_search_results) {
   // TODO(xiyuan): Highlight default match instead of the first.
-  if (IsNamedPageActive(NAMED_PAGE_SEARCH_RESULTS) &&
+  if (IsShowStateActive(AppListModel::SHOW_SEARCH_RESULTS) &&
       search_results_view_->visible()) {
     search_results_view_->SetSelectedIndex(0);
   }
   if (search_results_view_)
     search_results_view_->UpdateAutoLaunchState();
 
-  if (IsNamedPageActive(NAMED_PAGE_START)) {
+  if (IsShowStateActive(AppListModel::SHOW_START)) {
     if (show_search_results)
       start_page_view_->ShowSearchResults();
     else
@@ -169,10 +171,10 @@ void ContentsView::ActivePageChanged(bool show_search_results) {
 }
 
 void ContentsView::ShowSearchResults(bool show) {
-  int search_page = GetPageIndexForNamedPage(
+  int search_page = GetPageIndexForShowState(
       app_list::switches::IsExperimentalAppListEnabled()
-          ? NAMED_PAGE_START
-          : NAMED_PAGE_SEARCH_RESULTS);
+          ? AppListModel::SHOW_START
+          : AppListModel::SHOW_SEARCH_RESULTS);
   DCHECK_GE(search_page, 0);
 
   SetActivePageInternal(show ? search_page : page_before_search_, show);
@@ -180,9 +182,9 @@ void ContentsView::ShowSearchResults(bool show) {
 
 bool ContentsView::IsShowingSearchResults() const {
   return app_list::switches::IsExperimentalAppListEnabled()
-             ? IsNamedPageActive(NAMED_PAGE_START) &&
+             ? IsShowStateActive(AppListModel::SHOW_START) &&
                    start_page_view_->IsShowingSearchResults()
-             : IsNamedPageActive(NAMED_PAGE_SEARCH_RESULTS);
+             : IsShowStateActive(AppListModel::SHOW_SEARCH_RESULTS);
 }
 
 gfx::Rect ContentsView::GetOffscreenPageBounds(int page_index) const {
@@ -191,8 +193,8 @@ gfx::Rect ContentsView::GetOffscreenPageBounds(int page_index) const {
   // are below.
   int page_height = bounds.height();
   bool origin_above =
-      GetPageIndexForNamedPage(NAMED_PAGE_START) == page_index ||
-      GetPageIndexForNamedPage(NAMED_PAGE_SEARCH_RESULTS) == page_index;
+      GetPageIndexForShowState(AppListModel::SHOW_START) == page_index ||
+      GetPageIndexForShowState(AppListModel::SHOW_SEARCH_RESULTS) == page_index;
   bounds.set_y(origin_above ? -page_height : page_height);
   return bounds;
 }
@@ -258,9 +260,10 @@ int ContentsView::AddLauncherPage(views::View* view, int resource_id) {
 
 int ContentsView::AddLauncherPage(views::View* view,
                                   int resource_id,
-                                  NamedPage named_page) {
+                                  AppListModel::ShowState show_state) {
   int page_index = AddLauncherPage(view, resource_id);
-  named_page_to_view_.insert(std::pair<NamedPage, int>(named_page, page_index));
+  show_state_to_view_.insert(
+      std::pair<AppListModel::ShowState, int>(show_state, page_index));
   return page_index;
 }