| 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 #ifndef UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_ | 5 #ifndef UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_ |
| 6 #define UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_ | 6 #define UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 static std::string GenerateId(); | 76 static std::string GenerateId(); |
| 77 | 77 |
| 78 // FolderImageObserver overrides: | 78 // FolderImageObserver overrides: |
| 79 void OnFolderImageUpdated() override; | 79 void OnFolderImageUpdated() override; |
| 80 | 80 |
| 81 private: | 81 private: |
| 82 // The type of folder; may affect behavior of folder views. | 82 // The type of folder; may affect behavior of folder views. |
| 83 const FolderType folder_type_; | 83 const FolderType folder_type_; |
| 84 | 84 |
| 85 // List of items in the folder. | 85 // List of items in the folder. |
| 86 scoped_ptr<AppListItemList> item_list_; | 86 std::unique_ptr<AppListItemList> item_list_; |
| 87 | 87 |
| 88 FolderImage folder_image_; | 88 FolderImage folder_image_; |
| 89 | 89 |
| 90 DISALLOW_COPY_AND_ASSIGN(AppListFolderItem); | 90 DISALLOW_COPY_AND_ASSIGN(AppListFolderItem); |
| 91 }; | 91 }; |
| 92 | 92 |
| 93 } // namespace app_list | 93 } // namespace app_list |
| 94 | 94 |
| 95 #endif // UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_ | 95 #endif // UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_ |
| OLD | NEW |