Index: ui/app_list/app_list_constants.cc |
diff --git a/ui/app_list/app_list_constants.cc b/ui/app_list/app_list_constants.cc |
index 8c1d360f185700ef7d9dac9af199b7ed05eccfdf..730535d6184f305bb6b585561fa538d1fb111883 100644 |
--- a/ui/app_list/app_list_constants.cc |
+++ b/ui/app_list/app_list_constants.cc |
@@ -82,7 +82,7 @@ const gfx::Tween::Type kFolderFadeInTweenType = gfx::Tween::EASE_IN_2; |
const gfx::Tween::Type kFolderFadeOutTweenType = gfx::Tween::FAST_OUT_LINEAR_IN; |
// Preferred number of columns and rows in apps grid. |
-const int kPreferredCols = 4; |
+const int kPreferredCols = 6; |
const int kPreferredRows = 4; |
const int kGridIconDimension = 48; |
@@ -95,14 +95,6 @@ const int kTileIconSize = 48; |
const SkColor kIconColor = gfx::kChromeIconGrey; |
-// Preferred number of columns and rows in the centered app list apps grid. |
-const int kCenteredPreferredCols = 6; |
-const int kCenteredPreferredRows = 3; |
- |
-// Preferred number of columns and rows in the experimental app list apps grid. |
-const int kExperimentalPreferredCols = 6; |
-const int kExperimentalPreferredRows = 4; |
- |
// The number of apps shown in the start page app grid. |
const size_t kNumStartPageTiles = 9; |
@@ -112,13 +104,11 @@ const size_t kMaxSearchResults = 6; |
// Radius of the circle, in which if entered, show re-order preview. |
const int kReorderDroppingCircleRadius = 35; |
-// The padding around the outside of the experimental app list apps grid |
-// (sides). |
-const int kExperimentalAppsGridPadding = 24; |
+// The padding around the outside of the apps grid (sides). |
+const int kAppsGridPadding = 24; |
-// The padding around the outside of the experimental app list search box (top |
-// and sides). |
-const int kExperimentalSearchBoxPadding = 16; |
+// The padding around the outside of the search box (top and sides). |
+const int kSearchBoxPadding = 16; |
// Max items allowed in a folder. |
size_t kMaxFolderItems = 16; |