| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_FOLDER_IMAGE_H_ | 5 #ifndef UI_APP_LIST_FOLDER_IMAGE_H_ |
| 6 #define UI_APP_LIST_FOLDER_IMAGE_H_ | 6 #define UI_APP_LIST_FOLDER_IMAGE_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 | 86 |
| 87 // The icon image. | 87 // The icon image. |
| 88 gfx::ImageSkia icon_; | 88 gfx::ImageSkia icon_; |
| 89 | 89 |
| 90 // List of top-level app list items (to display small in the icon). | 90 // List of top-level app list items (to display small in the icon). |
| 91 AppListItemList* item_list_; | 91 AppListItemList* item_list_; |
| 92 | 92 |
| 93 // Top items for generating folder icon. | 93 // Top items for generating folder icon. |
| 94 std::vector<AppListItem*> top_items_; | 94 std::vector<AppListItem*> top_items_; |
| 95 | 95 |
| 96 ObserverList<FolderImageObserver> observers_; | 96 base::ObserverList<FolderImageObserver> observers_; |
| 97 }; | 97 }; |
| 98 | 98 |
| 99 } // namespace app_list | 99 } // namespace app_list |
| 100 | 100 |
| 101 #endif // UI_APP_LIST_FOLDER_IMAGE_H_ | 101 #endif // UI_APP_LIST_FOLDER_IMAGE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1162943002:
Replace more ObserverList with base::ObserverList. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@observer