Make app list search box into a Widget.

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 124 matching lines @@
 
   // Returns whether the app list showing |state|.
   bool IsStateShown(AppListModel::State state);
 
   // Shows the app list and waits until a paint occurs.
   void Show();
 
   // Closes the app list. This sets |view_| to NULL.
   void Close();
 
+  // Checks the search box widget is at |expected| in the contents view's
+  // coordinate space.
+  bool CheckSearchBoxWidget(const gfx::Rect& expected);
+
   // Gets the PaginationModel owned by |view_|.
   PaginationModel* GetPaginationModel();
 
   const TestType test_type_;
   scoped_ptr<base::RunLoop> run_loop_;
   app_list::AppListView* view_;  // Owned by native widget.
   scoped_ptr<app_list::test::AppListTestViewDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListViewTestContext);
 };
@@ skipping 101 matching lines @@
 
 void AppListViewTestContext::Close() {
   view_->GetWidget()->Close();
   run_loop_.reset(new base::RunLoop);
   run_loop_->Run();
 
   // |view_| should have been deleted and set to NULL via ViewClosing().
   EXPECT_FALSE(view_);
 }
 
+bool AppListViewTestContext::CheckSearchBoxWidget(const gfx::Rect& expected) {
+  ContentsView* contents_view = view_->app_list_main_view()->contents_view();
+  gfx::Point point = expected.origin();
+  views::View::ConvertPointToScreen(contents_view, &point);
+
+  return gfx::Rect(point, expected.size()) ==
+         view_->search_box_widget()->GetWindowBoundsInScreen();
+}
+
 PaginationModel* AppListViewTestContext::GetPaginationModel() {
   return view_->GetAppsPaginationModel();
 }
 
 void AppListViewTestContext::RunDisplayTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   delegate_->GetTestModel()->PopulateApps(kInitialItems);
 
   Show();
@@ skipping 319 matching lines @@
   EXPECT_EQ(default_contents_bounds,
             contents_view->apps_container_view()->bounds());
 
   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());
     // TODO(mgiuca): The search box should be small and centered.
-    EXPECT_EQ(contents_view->GetDefaultSearchBoxBounds(),
-              view_->search_box_view()->bounds());
+    EXPECT_TRUE(
+        CheckSearchBoxWidget(contents_view->GetDefaultSearchBoxBounds()));
 
     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());
     view_->Layout();
     EXPECT_TRUE(
         contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
-    EXPECT_EQ(contents_view->GetDefaultSearchBoxBounds(),
-              view_->search_box_view()->bounds());
+    EXPECT_TRUE(
+        CheckSearchBoxWidget(contents_view->GetDefaultSearchBoxBounds()));
 
     // Check that typing into the search box triggers the search page.
     EXPECT_TRUE(SetAppListState(AppListModel::STATE_APPS));
     view_->Layout();
     EXPECT_EQ(default_contents_bounds,
               contents_view->apps_container_view()->bounds());
-    EXPECT_EQ(contents_view->GetDefaultSearchBoxBounds(),
-              view_->search_box_view()->bounds());
+    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());
     view_->Layout();
     EXPECT_TRUE(
         contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
-    EXPECT_EQ(contents_view->GetDefaultSearchBoxBounds(),
-              view_->search_box_view()->bounds());
+    EXPECT_TRUE(
+        CheckSearchBoxWidget(contents_view->GetDefaultSearchBoxBounds()));
   }
 
   Close();
 }
 
 class AppListViewTestAura : public views::ViewsTestBase,
                             public ::testing::WithParamInterface<int> {
  public:
   AppListViewTestAura() {}
   virtual ~AppListViewTestAura() {}
@@ skipping 154 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