Move app list search box into AppListView.

ui/app_list/views/apps_grid_view.cc

 // Copyright (c) 2012 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/apps_grid_view.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
@@ skipping 42 matching lines @@
 
 namespace {
 
 // Distance a drag needs to be from the app grid to be considered 'outside', at
 // which point we rearrange the apps to their pre-drag configuration, as a drop
 // then would be canceled. We have a buffer to make it easier to drag apps to
 // other pages.
 const int kDragBufferPx = 20;
 
 // Padding space in pixels for fixed layout.
-const int kTopPadding = 1;
-const int kBottomPadding = 1;
+const int kBottomPadding = 3;
 const int kLeftRightPadding = 24;
 
 // Padding space in pixels between pages.
 const int kPagePadding = 40;
 
 // Preferred tile size when showing in fixed layout.
 const int kPreferredTileWidth = 88;
 const int kPreferredTileHeight = 98;
 
 const int kExperimentalPreferredTileWidth = 90;
@@ skipping 344 matching lines @@
   // Make sure |page_switcher_view_| is deleted before |pagination_model_|.
   view_model_.Clear();
   RemoveAllChildViews(true);
 }
 
 void AppsGridView::SetLayout(int cols, int rows_per_page) {
   cols_ = cols;
   rows_per_page_ = rows_per_page;
 
   if (switches::IsExperimentalAppListEnabled()) {
-    SetBorder(views::Border::CreateEmptyBorder(0,
-                                               kExperimentalWindowPadding,
-                                               kBottomPadding,
-                                               kExperimentalWindowPadding));
+    SetBorder(views::Border::CreateEmptyBorder(
+        0, kExperimentalWindowPadding, 0, kExperimentalWindowPadding));
   } else {
     SetBorder(views::Border::CreateEmptyBorder(
-        kTopPadding, kLeftRightPadding, kBottomPadding, kLeftRightPadding));
+        0, kLeftRightPadding, kBottomPadding, kLeftRightPadding));
   }
 }
 
 void AppsGridView::ResetForShowApps() {
   activated_folder_item_view_ = NULL;
   ClearDragState();
   layer()->SetOpacity(1.0f);
   SetVisible(true);
   // Set all views to visible in case they weren't made visible again by an
   // incomplete animation.
@@ skipping 1727 matching lines @@
 
 void AppsGridView::SetAsFolderDroppingTarget(const Index& target_index,
                                              bool is_target_folder) {
   AppListItemView* target_view =
       GetViewDisplayedAtSlotOnCurrentPage(target_index.slot);
   if (target_view)
     target_view->SetAsAttemptedFolderTarget(is_target_folder);
 }
 
 }  // namespace app_list