Move ContentsView::NamedPage to AppListModel::ShowState.

ui/app_list/views/app_list_main_view.cc

 // Copyright 2013 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.
 
 #include "ui/app_list/views/app_list_main_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 96 matching lines @@
 }
 
 void AppListMainView::AddContentsViews() {
   DCHECK(search_box_view_);
 
   contents_view_ = new ContentsView(this);
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     contents_switcher_view_ = new ContentsSwitcherView(contents_view_);
     contents_view_->SetContentsSwitcherView(contents_switcher_view_);
   }
-  contents_view_->InitNamedPages(model_, delegate_);
+  contents_view_->Init(model_, delegate_);
   AddChildView(contents_view_);
   if (contents_switcher_view_)
     AddChildView(contents_switcher_view_);
 
   search_box_view_->set_contents_view(contents_view_);
   UpdateSearchBoxVisibility();
 
   contents_view_->SetPaintToLayer(true);
   contents_view_->SetFillsBoundsOpaquely(false);
   contents_view_->layer()->SetMasksToBounds(true);
@@ skipping 12 matching lines @@
     return;
 
   icon_loading_wait_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kMaxIconLoadingWaitTimeInMs),
       this, &AppListMainView::OnIconLoadingWaitTimer);
 }
 
 void AppListMainView::ResetForShow() {
   if (switches::IsExperimentalAppListEnabled()) {
-    contents_view_->SetActivePage(contents_view_->GetPageIndexForNamedPage(
-        ContentsView::NAMED_PAGE_START));
+    contents_view_->SetActivePage(
+        contents_view_->GetPageIndexForShowState(AppListModel::SHOW_START));
   }
   contents_view_->apps_container_view()->ResetForShowApps();
   // We clear the search when hiding so when app list appears it is not showing
   // search results.
   search_box_view_->ClearSearch();
 }
 
 void AppListMainView::Close() {
   icon_loading_wait_timer_.Stop();
   contents_view_->CancelDrag();
@@ skipping 11 matching lines @@
   contents_view_ = NULL;
   if (contents_switcher_view_) {
     delete contents_switcher_view_;
     contents_switcher_view_ = NULL;
   }
   AddContentsViews();
   Layout();
 }
 
 void AppListMainView::UpdateSearchBoxVisibility() {
-  bool visible =
-      !contents_view_->IsNamedPageActive(ContentsView::NAMED_PAGE_START) ||
-      contents_view_->IsShowingSearchResults();
+  bool visible = !contents_view_->IsShowStateActive(AppListModel::SHOW_START) ||
+                 contents_view_->IsShowingSearchResults();
   search_box_view_->SetVisible(visible);
   if (visible && GetWidget() && GetWidget()->IsVisible())
     search_box_view_->search_box()->RequestFocus();
 }
 
 void AppListMainView::OnStartPageSearchTextfieldChanged(
     const base::string16& new_contents) {
   search_box_view_->SetVisible(true);
   search_box_view_->search_box()->SetText(new_contents);
   search_box_view_->search_box()->RequestFocus();
@@ skipping 109 matching lines @@
   // Resubmit the query via a posted task so that all observers for the
   // uninstall notification are notified.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&AppListMainView::QueryChanged,
                  weak_ptr_factory_.GetWeakPtr(),
                  search_box_view_));
 }
 
 }  // namespace app_list