Make start page fill app list bounds.

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 <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 228 matching lines @@
   contents_view->Layout();
   return IsStateShown(state);
 }
 
 bool AppListViewTestContext::IsStateShown(AppListModel::State state) {
   ContentsView* contents_view = view_->app_list_main_view()->contents_view();
   int index = contents_view->GetPageIndexForState(state);
   bool success = true;
   for (int i = 0; i < contents_view->NumLauncherPages(); ++i) {
     success = success &&
-              (i == index) == (contents_view->GetDefaultContentsBounds() ==
+              (i == index) == (contents_view->GetOnscreenPageBounds(i) ==
                                contents_view->GetPageView(i)->bounds());
   }
   return success && state == delegate_->GetTestModel()->state();
 }
 
 void AppListViewTestContext::Show() {
   view_->GetWidget()->Show();
   run_loop_.reset(new base::RunLoop);
   view_->SetNextPaintCallback(run_loop_->QuitClosure());
   run_loop_->Run();
@@ skipping 240 matching lines @@
     EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view()));
 
     ContentsView* contents_view = main_view->contents_view();
     // Pad the ContentsView with blank pages so we have at least 3 views.
     while (contents_view->NumLauncherPages() < 3)
       contents_view->AddBlankPageForTesting();
 
     contents_view->SetActivePage(0);
     contents_view->Layout();
 
-    const gfx::Rect expected_bounds = contents_view->GetDefaultContentsBounds();
-
-    EXPECT_EQ(expected_bounds, contents_view->GetPageView(0)->bounds());
-    EXPECT_NE(expected_bounds, contents_view->GetPageView(1)->bounds());
-    EXPECT_NE(expected_bounds, contents_view->GetPageView(2)->bounds());
+    EXPECT_EQ(contents_view->GetOnscreenPageBounds(0),
+              contents_view->GetPageView(0)->bounds());
+    EXPECT_NE(contents_view->GetOnscreenPageBounds(1),
+              contents_view->GetPageView(1)->bounds());
+    EXPECT_NE(contents_view->GetOnscreenPageBounds(2),
+              contents_view->GetPageView(2)->bounds());
 
     // Change pages. View should not have moved without Layout().
     contents_view->SetActivePage(1);
-    EXPECT_EQ(expected_bounds, contents_view->GetPageView(0)->bounds());
-    EXPECT_NE(expected_bounds, contents_view->GetPageView(1)->bounds());
-    EXPECT_NE(expected_bounds, contents_view->GetPageView(2)->bounds());
+    EXPECT_EQ(contents_view->GetOnscreenPageBounds(0),
+              contents_view->GetPageView(0)->bounds());
+    EXPECT_NE(contents_view->GetOnscreenPageBounds(1),
+              contents_view->GetPageView(1)->bounds());
+    EXPECT_NE(contents_view->GetOnscreenPageBounds(2),
+              contents_view->GetPageView(2)->bounds());
 
     // Change to a third page. This queues up the second animation behind the
     // first.
     contents_view->SetActivePage(2);
-    EXPECT_EQ(expected_bounds, contents_view->GetPageView(0)->bounds());
-    EXPECT_NE(expected_bounds, contents_view->GetPageView(1)->bounds());
-    EXPECT_NE(expected_bounds, contents_view->GetPageView(2)->bounds());
+    EXPECT_EQ(contents_view->GetOnscreenPageBounds(0),
+              contents_view->GetPageView(0)->bounds());
+    EXPECT_NE(contents_view->GetOnscreenPageBounds(1),
+              contents_view->GetPageView(1)->bounds());
+    EXPECT_NE(contents_view->GetOnscreenPageBounds(2),
+              contents_view->GetPageView(2)->bounds());
 
     // Call Layout(). Should jump to the third page.
     contents_view->Layout();
-    EXPECT_NE(expected_bounds, contents_view->GetPageView(0)->bounds());
-    EXPECT_NE(expected_bounds, contents_view->GetPageView(1)->bounds());
-    EXPECT_EQ(expected_bounds, contents_view->GetPageView(2)->bounds());
+    EXPECT_NE(contents_view->GetOnscreenPageBounds(0),
+              contents_view->GetPageView(0)->bounds());
+    EXPECT_NE(contents_view->GetOnscreenPageBounds(1),
+              contents_view->GetPageView(1)->bounds());
+    EXPECT_EQ(contents_view->GetOnscreenPageBounds(2),
+              contents_view->GetPageView(2)->bounds());
   }
 
   Close();
 }
 
 void AppListViewTestContext::RunProfileChangeTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   delegate_->GetTestModel()->PopulateApps(kInitialItems);
 
@@ skipping 49 matching lines @@
 
   AppListMainView* main_view = view_->app_list_main_view();
   ContentsView* contents_view = main_view->contents_view();
   EXPECT_TRUE(SetAppListState(AppListModel::STATE_APPS));
 
   // Show the search results.
   contents_view->ShowSearchResults(true);
   contents_view->Layout();
   EXPECT_TRUE(contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
 
-  const gfx::Rect default_contents_bounds =
-      contents_view->GetDefaultContentsBounds();
-  EXPECT_EQ(AppListModel::STATE_SEARCH_RESULTS,
-            delegate_->GetTestModel()->state());
-  EXPECT_EQ(default_contents_bounds,
-            contents_view->search_results_page_view()->bounds());
+  EXPECT_TRUE(IsStateShown(AppListModel::STATE_SEARCH_RESULTS));
 
   // Hide the search results.
   contents_view->ShowSearchResults(false);
   contents_view->Layout();
 
   // Check that we return to the page that we were on before the search.
-  EXPECT_TRUE(contents_view->IsStateActive(AppListModel::STATE_APPS));
-  EXPECT_EQ(AppListModel::STATE_APPS, delegate_->GetTestModel()->state());
-  EXPECT_EQ(default_contents_bounds,
-            contents_view->apps_container_view()->bounds());
+  EXPECT_TRUE(IsStateShown(AppListModel::STATE_APPS));
 
   if (test_type_ == EXPERIMENTAL) {
     // Check that typing into the search box triggers the search page.
     EXPECT_TRUE(SetAppListState(AppListModel::STATE_START));
     view_->Layout();
-    EXPECT_EQ(default_contents_bounds,
-              contents_view->start_page_view()->bounds());
-    EXPECT_TRUE(CheckSearchBoxWidget(
-        contents_view->GetSearchBoxBoundsForState(AppListModel::STATE_START)));
+    EXPECT_TRUE(IsStateShown(AppListModel::STATE_START));
 
     base::string16 search_text = base::UTF8ToUTF16("test");
     main_view->search_box_view()->search_box()->SetText(base::string16());
     main_view->search_box_view()->search_box()->InsertText(search_text);
     // Check that the current search is using |search_text|.
     EXPECT_EQ(search_text, delegate_->GetTestModel()->search_box()->text());
     EXPECT_EQ(search_text, main_view->search_box_view()->search_box()->text());
     contents_view->Layout();
     EXPECT_TRUE(
         contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
     EXPECT_TRUE(
         CheckSearchBoxWidget(contents_view->GetDefaultSearchBoxBounds()));
 
     // Check that typing into the search box triggers the search page.
     EXPECT_TRUE(SetAppListState(AppListModel::STATE_APPS));
     contents_view->Layout();
-    EXPECT_EQ(default_contents_bounds,
-              contents_view->apps_container_view()->bounds());
+    EXPECT_TRUE(IsStateShown(AppListModel::STATE_APPS));
     EXPECT_TRUE(
         CheckSearchBoxWidget(contents_view->GetDefaultSearchBoxBounds()));
 
     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 |new_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());
     contents_view->Layout();
-    EXPECT_TRUE(
-        contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
+    EXPECT_TRUE(IsStateShown(AppListModel::STATE_SEARCH_RESULTS));
     EXPECT_TRUE(
         CheckSearchBoxWidget(contents_view->GetDefaultSearchBoxBounds()));
   }
 
   Close();
 }
 
 class AppListViewTestAura : public views::ViewsTestBase,
                             public ::testing::WithParamInterface<int> {
  public:
@@ skipping 158 matching lines @@
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 #endif
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list