Move app list search box into AppListView.

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 25 matching lines @@
 namespace {
 
 enum TestType {
   TEST_TYPE_START = 0,
   NORMAL = TEST_TYPE_START,
   LANDSCAPE,
   EXPERIMENTAL,
   TEST_TYPE_END,
 };
 
-bool IsViewAtOrigin(views::View* view) {
-  return view->bounds().origin().IsOrigin();
-}
-
 size_t GetVisibleTileItemViews(const std::vector<TileItemView*>& tiles) {
   size_t count = 0;
   for (std::vector<TileItemView*>::const_iterator it = tiles.begin();
        it != tiles.end();
        ++it) {
     if ((*it)->visible())
       count++;
   }
   return count;
 }
@@ skipping 139 matching lines @@
   EXPECT_TRUE(subview->parent());
   EXPECT_TRUE(subview->visible());
   EXPECT_TRUE(subview->IsDrawn());
 }
 
 void AppListViewTestContext::ShowContentsViewPageAndVerify(int index) {
   ContentsView* contents_view = view_->app_list_main_view()->contents_view();
   contents_view->SetActivePage(index);
   contents_view->Layout();
   for (int i = 0; i < contents_view->NumLauncherPages(); ++i) {
-    EXPECT_EQ(i == index, IsViewAtOrigin(contents_view->GetPageView(i)));
+    EXPECT_EQ(i == index,
+              contents_view->GetDefaultContentsBounds() ==
+                  contents_view->GetPageView(i)->bounds());
   }
 }
 
 void AppListViewTestContext::Show() {
   view_->GetWidget()->Show();
   run_loop_.reset(new base::RunLoop);
   view_->SetNextPaintCallback(run_loop_->QuitClosure());
   run_loop_->Run();
 
   EXPECT_TRUE(view_->GetWidget()->IsVisible());
@@ skipping 157 matching lines @@
     EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
     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();
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->GetPageView(0)));
-    EXPECT_FALSE(IsViewAtOrigin(contents_view->GetPageView(1)));
-    EXPECT_FALSE(IsViewAtOrigin(contents_view->GetPageView(2)));
+
+    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());
 
     // Change pages. View should not have moved without Layout().
     contents_view->SetActivePage(1);
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->GetPageView(0)));
-    EXPECT_FALSE(IsViewAtOrigin(contents_view->GetPageView(1)));
-    EXPECT_FALSE(IsViewAtOrigin(contents_view->GetPageView(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());
 
     // Change to a third page. This queues up the second animation behind the
     // first.
     contents_view->SetActivePage(2);
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->GetPageView(0)));
-    EXPECT_FALSE(IsViewAtOrigin(contents_view->GetPageView(1)));
-    EXPECT_FALSE(IsViewAtOrigin(contents_view->GetPageView(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());
 
     // Call Layout(). Should jump to the third page.
     contents_view->Layout();
-    EXPECT_FALSE(IsViewAtOrigin(contents_view->GetPageView(0)));
-    EXPECT_FALSE(IsViewAtOrigin(contents_view->GetPageView(1)));
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->GetPageView(2)));
+    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());
   }
 
   Close();
 }
 
 void AppListViewTestContext::RunProfileChangeTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   delegate_->GetTestModel()->PopulateApps(kInitialItems);
 
@@ skipping 59 matching lines @@
   ShowContentsViewPageAndVerify(
       contents_view->GetPageIndexForNamedPage(ContentsView::NAMED_PAGE_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 =

[Matt Giuca, 2014/10/24 03:21:40]

Why not "default_contents_bounds"?

[calamity, 2014/10/24 06:13:07]

Done.

+      contents_view->GetDefaultContentsBounds();
   if (test_type_ == EXPERIMENTAL) {
     EXPECT_TRUE(
         contents_view->IsNamedPageActive(ContentsView::NAMED_PAGE_START));
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->start_page_view()));
+    EXPECT_EQ(active_contents_bounds,
+              contents_view->start_page_view()->bounds());
   } else {
     EXPECT_TRUE(contents_view->IsNamedPageActive(
         ContentsView::NAMED_PAGE_SEARCH_RESULTS));
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->search_results_view()));
+    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(IsViewAtOrigin(contents_view->apps_container_view()));
+  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));
 
     // 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(IsViewAtOrigin(contents_view->start_page_view()));
+    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));
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->apps_container_view()));
+    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());
@@ skipping 165 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