| Index: ui/app_list/apps_grid_view.h
|
| diff --git a/ui/app_list/apps_grid_view.h b/ui/app_list/apps_grid_view.h
|
| index a3862c68cd89d39d8fdae4938ba66e930802024d..7eeb08742560cdf9fbd4d512b3318523762abf83 100644
|
| --- a/ui/app_list/apps_grid_view.h
|
| +++ b/ui/app_list/apps_grid_view.h
|
| @@ -30,14 +30,6 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
|
| PaginationModel* pagination_model);
|
| virtual ~AppsGridView();
|
|
|
| - // Calculate preferred icon size, rows and cols for given |content_size| and
|
| - // |num_of_tiles|.
|
| - static void CalculateLayout(const gfx::Size& content_size,
|
| - int num_of_tiles,
|
| - gfx::Size* icon_size,
|
| - int* rows,
|
| - int* cols);
|
| -
|
| // Sets fixed layout parameters. After setting this, CalculateLayout below
|
| // is no longer called to dynamically choosing those layout params.
|
| void SetLayout(int icon_size, int cols, int rows_per_page);
|
| @@ -47,14 +39,11 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
|
|
|
| void SetSelectedItem(AppListItemView* item);
|
| void ClearSelectedItem(AppListItemView* item);
|
| + bool IsSelectedItem(const AppListItemView* item) const;
|
|
|
| - int tiles_per_page() const {
|
| - return cols_ * rows_per_page_;
|
| - }
|
| + void EnsureItemVisible(const AppListItemView* item);
|
|
|
| - bool fixed_layout() const {
|
| - return fixed_layout_;
|
| - }
|
| + int tiles_per_page() const { return cols_ * rows_per_page_; }
|
|
|
| // Overridden from views::View:
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| @@ -83,7 +72,6 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
|
| views::ButtonListener* listener_;
|
| PaginationModel* pagination_model_; // Owned by AppListView.
|
|
|
| - bool fixed_layout_;
|
| gfx::Size icon_size_;
|
| int cols_;
|
| int rows_per_page_;
|
|
|