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" |
(...skipping 15 matching lines...) Expand all Loading... |
26 show_state_(SHOW_NONE), | 26 show_state_(SHOW_NONE), |
27 top_icon_animation_pending_count_(0) { | 27 top_icon_animation_pending_count_(0) { |
28 apps_grid_view_ = new AppsGridView(app_list_main_view); | 28 apps_grid_view_ = new AppsGridView(app_list_main_view); |
29 int cols = kPreferredCols; | 29 int cols = kPreferredCols; |
30 int rows = kPreferredRows; | 30 int rows = kPreferredRows; |
31 // ShouldCenterWindow also implies that it is wide instead of tall. | 31 // ShouldCenterWindow also implies that it is wide instead of tall. |
32 if (app_list_main_view->ShouldCenterWindow()) { | 32 if (app_list_main_view->ShouldCenterWindow()) { |
33 cols = kExperimentalPreferredCols; | 33 cols = kExperimentalPreferredCols; |
34 rows = kExperimentalPreferredRows; | 34 rows = kExperimentalPreferredRows; |
35 } | 35 } |
36 apps_grid_view_->SetLayout(kPreferredIconDimension, cols, rows); | 36 apps_grid_view_->SetLayout(cols, rows); |
37 AddChildView(apps_grid_view_); | 37 AddChildView(apps_grid_view_); |
38 | 38 |
39 folder_background_view_ = new FolderBackgroundView(); | 39 folder_background_view_ = new FolderBackgroundView(); |
40 AddChildView(folder_background_view_); | 40 AddChildView(folder_background_view_); |
41 | 41 |
42 app_list_folder_view_ = | 42 app_list_folder_view_ = |
43 new AppListFolderView(this, model, app_list_main_view); | 43 new AppListFolderView(this, model, app_list_main_view); |
44 // The folder view is initially hidden. | 44 // The folder view is initially hidden. |
45 app_list_folder_view_->SetVisible(false); | 45 app_list_folder_view_->SetVisible(false); |
46 AddChildView(app_list_folder_view_); | 46 AddChildView(app_list_folder_view_); |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 void AppsContainerView::PrepareToShowApps(AppListFolderItem* folder_item) { | 230 void AppsContainerView::PrepareToShowApps(AppListFolderItem* folder_item) { |
231 if (folder_item) | 231 if (folder_item) |
232 CreateViewsForFolderTopItemsAnimation(folder_item, false); | 232 CreateViewsForFolderTopItemsAnimation(folder_item, false); |
233 | 233 |
234 // Hide the active folder item until the animation completes. | 234 // Hide the active folder item until the animation completes. |
235 if (apps_grid_view_->activated_folder_item_view()) | 235 if (apps_grid_view_->activated_folder_item_view()) |
236 apps_grid_view_->activated_folder_item_view()->SetVisible(false); | 236 apps_grid_view_->activated_folder_item_view()->SetVisible(false); |
237 } | 237 } |
238 | 238 |
239 } // namespace app_list | 239 } // namespace app_list |
OLD | NEW |