Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(634)

Unified Diff: ui/app_list/views/app_list_main_view.cc

Issue 578223002: Experimental app list: Enforce a 24-pixel padding on the top and sides. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ares-folder-heading-line-width
Patch Set: Rebase. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/app_list_background.cc ('k') | ui/app_list/views/folder_header_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a5d94bcfab448daee3417e49e7485033e8264fd0..4404d35a41b48352c5ad1495fef82e080154477b 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -42,9 +42,6 @@ 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
@@ -118,17 +115,18 @@ AppListMainView::AppListMainView(AppListViewDelegate* delegate,
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();
« no previous file with comments | « ui/app_list/views/app_list_background.cc ('k') | ui/app_list/views/folder_header_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698