Experimental app list: Enforce a 24-pixel padding on the top and sides.

ui/app_list/views/app_list_main_view.cc

 // Copyright 2013 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_main_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 24 matching lines @@
 namespace app_list {
 
 namespace {
 
 // Border padding space around the bubble contents.
 const int kPadding = 1;
 
 // The maximum allowed time to wait for icon loading in milliseconds.
 const int kMaxIconLoadingWaitTimeInMs = 50;
 
-// The padding around the search box in the experimental app list.
-const int kSearchBoxViewPadding = 23;
-
 // A view that holds another view and takes its preferred size. This is used for
 // wrapping the search box view so it still gets laid out while hidden. This is
 // a separate class so it can notify the main view on search box visibility
 // change.
 class SearchBoxContainerView : public views::View {
  public:
   SearchBoxContainerView(AppListMainView* host, SearchBoxView* search_box)
       : host_(host), search_box_(search_box) {
     SetLayoutManager(new views::FillLayout());
     AddChildView(search_box);
@@ skipping 53 matching lines @@
 
 AppListMainView::AppListMainView(AppListViewDelegate* delegate,
                                  int initial_apps_page,
                                  gfx::NativeView parent)
     : delegate_(delegate),
       model_(delegate->GetModel()),
       search_box_view_(NULL),
       contents_view_(NULL),
       contents_switcher_view_(NULL),
       weak_ptr_factory_(this) {
-  SetLayoutManager(
-      new views::BoxLayout(views::BoxLayout::kVertical, kPadding, kPadding, 0));
+  SetBorder(
+      views::Border::CreateEmptyBorder(kPadding, kPadding, kPadding, kPadding));
+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 
   search_box_view_ = new SearchBoxView(this, delegate);
   views::View* container = new SearchBoxContainerView(this, search_box_view_);
   if (switches::IsExperimentalAppListEnabled()) {
     container->SetBorder(
-        views::Border::CreateEmptyBorder(kSearchBoxViewPadding,
-                                         kSearchBoxViewPadding,
+        views::Border::CreateEmptyBorder(kExperimentalWindowPadding,
+                                         kExperimentalWindowPadding,
                                          0,
-                                         kSearchBoxViewPadding));
+                                         kExperimentalWindowPadding));
   }
   AddChildView(container);
   AddContentsViews();
 
   // Switch the apps grid view to the specified page.
   app_list::PaginationModel* pagination_model = GetAppsPaginationModel();
   if (pagination_model->is_valid_page(initial_apps_page))
     pagination_model->SelectPage(initial_apps_page, false);
 
   // Starts icon loading early.
@@ skipping 200 matching lines @@
   // Resubmit the query via a posted task so that all observers for the
   // uninstall notification are notified.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&AppListMainView::QueryChanged,
                  weak_ptr_factory_.GetWeakPtr(),
                  search_box_view_));
 }
 
 }  // namespace app_list