Move app list search box into AppListView.

ui/app_list/views/app_list_background.cc

Index: ui/app_list/views/app_list_background.cc
diff --git a/ui/app_list/views/app_list_background.cc b/ui/app_list/views/app_list_background.cc
index 008897ab51906e63bacb007593d172823a6bfe17..2167aba66221478accb4ad090bbbcc151e50a9bf 100644
--- a/ui/app_list/views/app_list_background.cc
+++ b/ui/app_list/views/app_list_background.cc
@@ -19,9 +19,6 @@
 
 namespace {
 
-// Size of top separator between searchbox and grid view.
-const int kTopSeparatorSize = 1;
-
 // Size of bottom separator between contents view and contents switcher.
 const int kBottomSeparatorSize = 1;
 
@@ -53,26 +50,6 @@ void AppListBackground::Paint(gfx::Canvas* canvas,
   paint.setStyle(SkPaint::kFill_Style);
 
   int contents_top = bounds.y();
-  views::View* search_box_view = main_view_->search_box_view();
-  if (main_view_->visible() && search_box_view->visible() &&
-      !app_list::switches::IsExperimentalAppListEnabled()) {
-    const gfx::Rect search_box_view_bounds =
-        search_box_view->ConvertRectToWidget(search_box_view->GetLocalBounds());
-    gfx::Rect search_box_rect(
-        bounds.x(),
-        bounds.y(),
-        bounds.width(),
-        search_box_view_bounds.bottom() - bounds.y() + kTopSeparatorSize);
-
-    paint.setColor(kSearchBoxBackground);
-    canvas->DrawRect(search_box_rect, paint);
-
-    gfx::Rect separator_rect(search_box_rect);
-    separator_rect.Inset(0, search_box_rect.height() - kTopSeparatorSize, 0, 0);
-    canvas->FillRect(separator_rect, kTopSeparatorColor);
-    contents_top = separator_rect.bottom();
-  }
-
   gfx::Rect contents_rect(bounds.x(),
                           contents_top,
                           bounds.width(),