Move ContentsView::NamedPage to AppListModel::ShowState.

ui/app_list/views/app_list_view_unittest.cc

 // Copyright 2014 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_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 251 matching lines @@
     EXPECT_EQ(2, GetPaginationModel()->total_pages());
   else
     EXPECT_EQ(3, GetPaginationModel()->total_pages());
   EXPECT_EQ(0, GetPaginationModel()->selected_page());
 
   // Checks on the main view.
   AppListMainView* main_view = view_->app_list_main_view();
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view()));
 
-  EXPECT_TRUE(main_view->contents_view()->IsNamedPageActive(
-      test_type_ == EXPERIMENTAL ? ContentsView::NAMED_PAGE_START
-                                 : ContentsView::NAMED_PAGE_APPS));
+  EXPECT_TRUE(main_view->contents_view()->IsShowStateActive(
+      test_type_ == EXPERIMENTAL ? AppListModel::SHOW_START
+                                 : AppListModel::SHOW_APPS));
 
   Close();
 }
 
 void AppListViewTestContext::RunReshowWithOpenFolderTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
 
   AppListTestModel* model = delegate_->GetTestModel();
   model->PopulateApps(kInitialItems);
@@ skipping 47 matching lines @@
   StartPageView* start_page_view =
       main_view->contents_view()->start_page_view();
   // Checks on the main view.
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view()));
   if (test_type_ == EXPERIMENTAL) {
     EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view));
 
     // Show the start page view.
     ContentsView* contents_view = main_view->contents_view();
-    ShowContentsViewPageAndVerify(contents_view->GetPageIndexForNamedPage(
-        ContentsView::NAMED_PAGE_START));
+    ShowContentsViewPageAndVerify(
+        contents_view->GetPageIndexForShowState(AppListModel::SHOW_START));
     EXPECT_FALSE(main_view->search_box_view()->visible());
 
     gfx::Size view_size(view_->GetPreferredSize());
     ShowContentsViewPageAndVerify(
-        contents_view->GetPageIndexForNamedPage(ContentsView::NAMED_PAGE_APPS));
+        contents_view->GetPageIndexForShowState(AppListModel::SHOW_APPS));
     EXPECT_TRUE(main_view->search_box_view()->visible());
 
     // Hiding and showing the search box should not affect the app list's
     // preferred size. This is a regression test for http://crbug.com/386912.
     EXPECT_EQ(view_size.ToString(), view_->GetPreferredSize().ToString());
 
     // Check tiles hide and show on deletion and addition.
     model->results()->Add(new TestTileSearchResult());
     start_page_view->UpdateForTesting();
     EXPECT_EQ(1u, GetVisibleTileItemViews(start_page_view->tile_views()));
@@ skipping 111 matching lines @@
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   AppListTestModel* model = delegate_->GetTestModel();
   model->PopulateApps(3);
 
   Show();
 
   AppListMainView* main_view = view_->app_list_main_view();
   ContentsView* contents_view = main_view->contents_view();
   ShowContentsViewPageAndVerify(
-      contents_view->GetPageIndexForNamedPage(ContentsView::NAMED_PAGE_APPS));
+      contents_view->GetPageIndexForShowState(AppListModel::SHOW_APPS));
   EXPECT_TRUE(main_view->search_box_view()->visible());
 
   // Show the search results.
   contents_view->ShowSearchResults(true);
   contents_view->Layout();
   EXPECT_TRUE(contents_view->IsShowingSearchResults());
   EXPECT_TRUE(main_view->search_box_view()->visible());
 
   const gfx::Rect active_contents_bounds =
       contents_view->GetDefaultContentsBounds();
   if (test_type_ == EXPERIMENTAL) {
-    EXPECT_TRUE(
-        contents_view->IsNamedPageActive(ContentsView::NAMED_PAGE_START));
+    EXPECT_TRUE(contents_view->IsShowStateActive(AppListModel::SHOW_START));
     EXPECT_EQ(active_contents_bounds,
               contents_view->start_page_view()->bounds());
   } else {
-    EXPECT_TRUE(contents_view->IsNamedPageActive(
-        ContentsView::NAMED_PAGE_SEARCH_RESULTS));
+    EXPECT_TRUE(
+        contents_view->IsShowStateActive(AppListModel::SHOW_SEARCH_RESULTS));
     EXPECT_EQ(active_contents_bounds,
               contents_view->search_results_view()->bounds());
   }
 
   // Hide the search results.
   contents_view->ShowSearchResults(false);
   contents_view->Layout();
   EXPECT_FALSE(contents_view->IsShowingSearchResults());
 
   // Check that we return to the page that we were on before the search.
-  EXPECT_TRUE(contents_view->IsNamedPageActive(ContentsView::NAMED_PAGE_APPS));
+  EXPECT_TRUE(contents_view->IsShowStateActive(AppListModel::SHOW_APPS));
   EXPECT_EQ(active_contents_bounds,
             contents_view->apps_container_view()->bounds());
   EXPECT_TRUE(main_view->search_box_view()->visible());
 
   if (test_type_ == EXPERIMENTAL) {
-    ShowContentsViewPageAndVerify(contents_view->GetPageIndexForNamedPage(
-        ContentsView::NAMED_PAGE_START));
+    ShowContentsViewPageAndVerify(
+        contents_view->GetPageIndexForShowState(AppListModel::SHOW_START));
 
     // Check that typing into the dummy search box triggers the search page.
     base::string16 search_text = base::UTF8ToUTF16("test");
     SearchBoxView* dummy_search_box =
         contents_view->start_page_view()->dummy_search_box_view();
     EXPECT_TRUE(dummy_search_box->IsDrawn());
     dummy_search_box->search_box()->InsertText(search_text);
     contents_view->Layout();
     // Check that the current search is using |search_text|.
     EXPECT_EQ(search_text, delegate_->GetTestModel()->search_box()->text());
     EXPECT_TRUE(contents_view->IsShowingSearchResults());
     EXPECT_FALSE(dummy_search_box->IsDrawn());
     EXPECT_TRUE(main_view->search_box_view()->visible());
     EXPECT_EQ(search_text, main_view->search_box_view()->search_box()->text());
-    EXPECT_TRUE(
-        contents_view->IsNamedPageActive(ContentsView::NAMED_PAGE_START));
+    EXPECT_TRUE(contents_view->IsShowStateActive(AppListModel::SHOW_START));
     EXPECT_EQ(active_contents_bounds,
               contents_view->start_page_view()->bounds());
 
     // Check that typing into the real search box triggers the search page.
     ShowContentsViewPageAndVerify(
-        contents_view->GetPageIndexForNamedPage(ContentsView::NAMED_PAGE_APPS));
+        contents_view->GetPageIndexForShowState(AppListModel::SHOW_APPS));
     EXPECT_EQ(active_contents_bounds,
               contents_view->apps_container_view()->bounds());
 
     base::string16 new_search_text = base::UTF8ToUTF16("apple");
     main_view->search_box_view()->search_box()->SetText(base::string16());
     main_view->search_box_view()->search_box()->InsertText(new_search_text);
     // Check that the current search is using |search_text|.
     EXPECT_EQ(new_search_text, delegate_->GetTestModel()->search_box()->text());
     EXPECT_EQ(new_search_text,
               main_view->search_box_view()->search_box()->text());
     EXPECT_TRUE(contents_view->IsShowingSearchResults());
     EXPECT_FALSE(dummy_search_box->IsDrawn());
     EXPECT_TRUE(main_view->search_box_view()->visible());
     EXPECT_TRUE(dummy_search_box->search_box()->text().empty());
 
     // Check that the dummy search box is clear when reshowing the start page.
     ShowContentsViewPageAndVerify(
-        contents_view->GetPageIndexForNamedPage(ContentsView::NAMED_PAGE_APPS));
-    ShowContentsViewPageAndVerify(contents_view->GetPageIndexForNamedPage(
-        ContentsView::NAMED_PAGE_START));
+        contents_view->GetPageIndexForShowState(AppListModel::SHOW_APPS));
+    ShowContentsViewPageAndVerify(
+        contents_view->GetPageIndexForShowState(AppListModel::SHOW_START));
     EXPECT_TRUE(dummy_search_box->IsDrawn());
     EXPECT_TRUE(dummy_search_box->search_box()->text().empty());
   }
 
   Close();
 }
 
 class AppListViewTestAura : public views::ViewsTestBase,
                             public ::testing::WithParamInterface<int> {
  public:
@@ skipping 147 matching lines @@
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list