| Index: ui/app_list/views/app_list_main_view.cc
|
| diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
|
| index 06cf0bcd7fdda3e3272e1c5c7245b0dc1fe35fe9..d043bb3d8088bf90eda634fa915769d5adf8cb30 100644
|
| --- a/ui/app_list/views/app_list_main_view.cc
|
| +++ b/ui/app_list/views/app_list_main_view.cc
|
| @@ -36,9 +36,6 @@ 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;
|
|
|
| @@ -113,9 +110,11 @@ AppListMainView::AppListMainView(AppListViewDelegate* delegate)
|
| contents_view_(NULL),
|
| contents_switcher_view_(NULL),
|
| weak_ptr_factory_(this) {
|
| - SetBorder(
|
| - views::Border::CreateEmptyBorder(kPadding, kPadding, kPadding, kPadding));
|
| - SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
|
| + SetLayoutManager(
|
| + new views::BoxLayout(views::BoxLayout::kVertical,
|
| + 0,
|
| + 0,
|
| + switches::IsExperimentalAppListEnabled() ? 0 : 1));
|
|
|
| search_box_view_ = new SearchBoxView(this, delegate);
|
| views::View* container = new SearchBoxContainerView(this, search_box_view_);
|
|
|