| 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/app_list_folder_view.h" | 5 #include "ui/app_list/views/app_list_folder_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "grit/ui_strings.h" | 9 #include "grit/ui_strings.h" |
| 10 #include "ui/accessibility/ax_view_state.h" | 10 #include "ui/accessibility/ax_view_state.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 view_model_(new views::ViewModel), | 50 view_model_(new views::ViewModel), |
| 51 model_(model), | 51 model_(model), |
| 52 folder_item_(NULL), | 52 folder_item_(NULL), |
| 53 hide_for_reparent_(false) { | 53 hide_for_reparent_(false) { |
| 54 AddChildView(folder_header_view_); | 54 AddChildView(folder_header_view_); |
| 55 view_model_->Add(folder_header_view_, kIndexFolderHeader); | 55 view_model_->Add(folder_header_view_, kIndexFolderHeader); |
| 56 | 56 |
| 57 items_grid_view_ = new AppsGridView(app_list_main_view_); | 57 items_grid_view_ = new AppsGridView(app_list_main_view_); |
| 58 items_grid_view_->set_folder_delegate(this); | 58 items_grid_view_->set_folder_delegate(this); |
| 59 items_grid_view_->SetLayout( | 59 items_grid_view_->SetLayout( |
| 60 kPreferredIconDimension, | |
| 61 container_view->apps_grid_view()->cols(), | 60 container_view->apps_grid_view()->cols(), |
| 62 container_view->apps_grid_view()->rows_per_page()); | 61 container_view->apps_grid_view()->rows_per_page()); |
| 63 items_grid_view_->SetModel(model); | 62 items_grid_view_->SetModel(model); |
| 64 AddChildView(items_grid_view_); | 63 AddChildView(items_grid_view_); |
| 65 view_model_->Add(items_grid_view_, kIndexChildItems); | 64 view_model_->Add(items_grid_view_, kIndexChildItems); |
| 66 | 65 |
| 67 SetPaintToLayer(true); | 66 SetPaintToLayer(true); |
| 68 SetFillsBoundsOpaquely(false); | 67 SetFillsBoundsOpaquely(false); |
| 69 | 68 |
| 70 model_->AddObserver(this); | 69 model_->AddObserver(this); |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 void AppListFolderView::GiveBackFocusToSearchBox() { | 312 void AppListFolderView::GiveBackFocusToSearchBox() { |
| 314 app_list_main_view_->search_box_view()->search_box()->RequestFocus(); | 313 app_list_main_view_->search_box_view()->search_box()->RequestFocus(); |
| 315 } | 314 } |
| 316 | 315 |
| 317 void AppListFolderView::SetItemName(AppListFolderItem* item, | 316 void AppListFolderView::SetItemName(AppListFolderItem* item, |
| 318 const std::string& name) { | 317 const std::string& name) { |
| 319 model_->SetItemName(item, name); | 318 model_->SetItemName(item, name); |
| 320 } | 319 } |
| 321 | 320 |
| 322 } // namespace app_list | 321 } // namespace app_list |
| OLD | NEW |