| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/app_list/views/apps_container_view.h" | 5 #include "ui/app_list/views/apps_container_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "ui/app_list/app_list_constants.h" | 11 #include "ui/app_list/app_list_constants.h" |
| 12 #include "ui/app_list/app_list_folder_item.h" | 12 #include "ui/app_list/app_list_folder_item.h" |
| 13 #include "ui/app_list/app_list_switches.h" | 13 #include "ui/app_list/app_list_switches.h" |
| 14 #include "ui/app_list/pagination_model.h" | 14 #include "ui/app_list/pagination_model.h" |
| 15 #include "ui/app_list/views/app_list_folder_view.h" | 15 #include "ui/app_list/views/app_list_folder_view.h" |
| 16 #include "ui/app_list/views/app_list_item_view.h" | 16 #include "ui/app_list/views/app_list_item_view.h" |
| 17 #include "ui/app_list/views/app_list_main_view.h" | 17 #include "ui/app_list/views/app_list_main_view.h" |
| 18 #include "ui/app_list/views/apps_grid_view.h" | 18 #include "ui/app_list/views/apps_grid_view.h" |
| 19 #include "ui/app_list/views/folder_background_view.h" | 19 #include "ui/app_list/views/folder_background_view.h" |
| 20 #include "ui/events/event.h" | 20 #include "ui/events/event.h" |
| 21 | 21 |
| 22 namespace app_list { | 22 namespace app_list { |
| 23 | 23 |
| 24 AppsContainerView::AppsContainerView(AppListMainView* app_list_main_view, | 24 AppsContainerView::AppsContainerView(AppListMainView* app_list_main_view, |
| 25 PaginationModel* pagination_model, | 25 PaginationModel* pagination_model, |
| 26 AppListModel* model) | 26 AppListModel* model) |
| 27 : model_(model), | 27 : model_(model), |
| 28 show_state_(SHOW_APPS), | 28 show_state_(SHOW_NONE), |
| 29 top_icon_animation_pending_count_(0) { | 29 top_icon_animation_pending_count_(0) { |
| 30 apps_grid_view_ = new AppsGridView(app_list_main_view, pagination_model); | 30 apps_grid_view_ = new AppsGridView(app_list_main_view, pagination_model); |
| 31 int cols = kPreferredCols; | 31 int cols = kPreferredCols; |
| 32 int rows = kPreferredRows; | 32 int rows = kPreferredRows; |
| 33 if (app_list::switches::IsExperimentalAppListPositionEnabled()) { | 33 if (app_list::switches::IsExperimentalAppListPositionEnabled()) { |
| 34 cols = kExperimentalPreferredCols; | 34 cols = kExperimentalPreferredCols; |
| 35 rows = kExperimentalPreferredRows; | 35 rows = kExperimentalPreferredRows; |
| 36 } | 36 } |
| 37 apps_grid_view_->SetLayout(kPreferredIconDimension, cols, rows); | 37 apps_grid_view_->SetLayout(kPreferredIconDimension, cols, rows); |
| 38 AddChildView(apps_grid_view_); | 38 AddChildView(apps_grid_view_); |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 void AppsContainerView::PrepareToShowApps(AppListFolderItem* folder_item) { | 225 void AppsContainerView::PrepareToShowApps(AppListFolderItem* folder_item) { |
| 226 if (folder_item) | 226 if (folder_item) |
| 227 CreateViewsForFolderTopItemsAnimation(folder_item, false); | 227 CreateViewsForFolderTopItemsAnimation(folder_item, false); |
| 228 | 228 |
| 229 // Hide the active folder item until the animation completes. | 229 // Hide the active folder item until the animation completes. |
| 230 if (apps_grid_view_->activated_item_view()) | 230 if (apps_grid_view_->activated_item_view()) |
| 231 apps_grid_view_->activated_item_view()->SetVisible(false); | 231 apps_grid_view_->activated_item_view()->SetVisible(false); |
| 232 } | 232 } |
| 233 | 233 |
| 234 } // namespace app_list | 234 } // namespace app_list |
| OLD | NEW |