Update apps grid view layout to match latest mocks.

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 kBottomPadding = 3;
+const int kBottomPadding = 2;
 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;
-const int kExperimentalPreferredTileHeight = 90;
+const int kExperimentalPreferredTileWidth = 100;
+const int kExperimentalPreferredTileHeight = 100;
 
 // Padding on each side of a tile.
-const int kExperimentalTileLeftRightPadding = 15;
-const int kExperimentalTileTopBottomPadding = 11;
+const int kExperimentalTileLeftRightPadding = 10;
+const int kExperimentalTileBottomPadding = 12;
+const int kExperimentalTileTopPadding = 6;
 
 // Width in pixels of the area on the sides that triggers a page flip.
 const int kPageFlipZoneSize = 40;
 
 // Delay in milliseconds to do the page flip.
 const int kPageFlipDelayInMs = 1000;
 
 // How many pages on either side of the selected one we prerender. Currently 0
 // to test impact of prerendering on UI jank for http://crbug.com/440224. Was 1.
 const int kPrerenderPages = 0;
@@ skipping 15 matching lines @@
 const int kFolderDroppingCircleRadius = 39;
 
 // Returns the size of a tile view excluding its padding.
 gfx::Size GetTileViewSize() {
   return switches::IsExperimentalAppListEnabled()
              ? gfx::Size(kExperimentalPreferredTileWidth,
                          kExperimentalPreferredTileHeight)
              : gfx::Size(kPreferredTileWidth, kPreferredTileHeight);
 }
 
+// Returns the padding around a tile view.
+gfx::Insets GetTilePadding() {
+  if (!switches::IsExperimentalAppListEnabled())
+    return gfx::Insets();
+
+  return gfx::Insets(
+      -kExperimentalTileLeftRightPadding, -kExperimentalTileTopPadding,
+      -kExperimentalTileLeftRightPadding, -kExperimentalTileBottomPadding);
+}
+
 // RowMoveAnimationDelegate is used when moving an item into a different row.
 // Before running the animation, the item's layer is re-created and kept in
 // the original position, then the item is moved to just before its target
 // position and opacity set to 0. When the animation runs, this delegate moves
 // the layer and fades it out while fading in the item at the same time.
 class RowMoveAnimationDelegate : public gfx::AnimationDelegate {
  public:
   RowMoveAnimationDelegate(views::View* view,
                            ui::Layer* layer,
                            const gfx::Rect& layer_target)
@@ skipping 276 matching lines @@
   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, 0, kExperimentalWindowPadding));
+        0, kExperimentalAppsGridPadding, 0, kExperimentalAppsGridPadding));
   } else {
     SetBorder(views::Border::CreateEmptyBorder(
         0, kLeftRightPadding, kBottomPadding, kLeftRightPadding));
   }
 }
 
 // static
 gfx::Size AppsGridView::GetTotalTileSize() {
   gfx::Size size = GetTileViewSize();
   if (switches::IsExperimentalAppListEnabled()) {
     size.Enlarge(2 * kExperimentalTileLeftRightPadding,
-                 2 * kExperimentalTileTopBottomPadding);
+                 kExperimentalTileBottomPadding);
   }
   return size;
 }
 
 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
@@ skipping 1680 matching lines @@
       (point.x() - bounds.x()) / total_tile_size.width(), 0, cols_ - 1);
   int row = ClampToRange((point.y() - bounds.y()) / total_tile_size.height(),
                          0,
                          rows_per_page_ - 1);
   return Index(pagination_model_.selected_page(), row * cols_ + col);
 }
 
 gfx::Size AppsGridView::GetTileGridSize() const {
   gfx::Rect bounds = GetExpectedTileBounds(0, 0);
   bounds.Union(GetExpectedTileBounds(rows_per_page_ - 1, cols_ - 1));
-  if (switches::IsExperimentalAppListEnabled())
-    bounds.Inset(-kExperimentalTileLeftRightPadding,
-                 -kExperimentalTileTopBottomPadding);
+  bounds.Inset(GetTilePadding());
   return bounds.size();
 }
 
 gfx::Rect AppsGridView::GetExpectedTileBounds(int slot) const {
   return GetExpectedTileBounds(slot / cols_, slot % cols_);
 }
 
 gfx::Rect AppsGridView::GetExpectedTileBounds(int row, int col) const {
   gfx::Rect bounds(GetContentsBounds());
   gfx::Size total_tile_size = GetTotalTileSize();
   gfx::Rect tile_bounds(gfx::Point(bounds.x() + col * total_tile_size.width(),
                                    bounds.y() + row * total_tile_size.height()),
                         total_tile_size);
-  tile_bounds.ClampToCenteredSize(GetTileViewSize());
+  tile_bounds.Inset(-GetTilePadding());
   return tile_bounds;
 }
 
 AppListItemView* AppsGridView::GetViewDisplayedAtSlotOnCurrentPage(
     int slot) const {
   if (slot < 0)
     return NULL;
 
   // Calculate the original bound of the tile at |index|.
   int row = slot / cols_;
@@ skipping 10 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