Clean up of tile sizing code for the Apps Grid View.

ui/app_list/views/apps_grid_view.h

 // 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.
 
 #ifndef UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
 #define UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
 
 #include <set>
 #include <string>
 
@@ skipping 387 matching lines @@
   // enclosed.
   // *|nearest_tile| and *|d_min| will be updated based on the calculation.
   // *|d_min| is the distance between |nearest_tile| and |drag_view_|.
   void CalculateNearestTileForVertex(
       const gfx::Point& vertex, Index* nearest_tile, int* d_min);
 
   // Returns the bounds of the tile in which |point| is enclosed if there
   // is a valid item sits on the tile.
   gfx::Rect GetTileBoundsForPoint(const gfx::Point& point, Index* tile_index);
 
-  // Gets the bounds of the tile located at |row| and |col| on current page.
-  gfx::Rect GetTileBounds(int row, int col) const;
+  // Returns the size of the entire tile grid.
+  gfx::Size GetTileGridSize() const;
+
+  // Gets the expected bounds of a tile located at |row| and |col| on current

[Matt Giuca, 2014/09/10 05:35:06]

nit: on *the* current page.

[calamity, 2014/09/11 06:53:35]

Done.

+  // page.
+  gfx::Rect GetExpectedTileBounds(int row, int col) const;
 
   // Returns true if the slot of |index| is the last possible slot to drop
   // an item, i.e. first empty slot next to the last item on the last page.
   bool IsLastPossibleDropTarget(const Index& index) const;
 
   // Gets the item view located at |slot| on the current page. If there is
   // no item located at |slot|, returns NULL.
   views::View* GetViewAtSlotOnCurrentPage(int slot);
 
   // Sets state of the view with |target_index| to |is_target_folder| for
@@ skipping 133 matching lines @@
 
   // True if the drag_view_ item is a folder item being dragged for reparenting.
   bool dragging_for_reparent_item_;
 
   DISALLOW_COPY_AND_ASSIGN(AppsGridView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_