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 ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ | 5 #ifndef ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ |
6 #define ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ | 6 #define ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ |
7 | 7 |
| 8 #include <string> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
10 #include "ash/ash_export.h" | 11 #include "ash/ash_export.h" |
11 #include "ash/common/shelf/shelf_constants.h" | 12 #include "ash/common/shelf/shelf_constants.h" |
12 #include "ui/gfx/image/image_skia.h" | 13 #include "ui/gfx/image/image_skia.h" |
13 | 14 |
14 namespace ash { | 15 namespace ash { |
15 | 16 |
16 typedef int ShelfID; | 17 typedef int ShelfID; |
17 | 18 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 ShelfItemType type = TYPE_UNDEFINED; | 65 ShelfItemType type = TYPE_UNDEFINED; |
65 | 66 |
66 // Image to display in the shelf. | 67 // Image to display in the shelf. |
67 gfx::ImageSkia image; | 68 gfx::ImageSkia image; |
68 | 69 |
69 // Assigned by the model when the item is added. | 70 // Assigned by the model when the item is added. |
70 ShelfID id = kInvalidShelfID; | 71 ShelfID id = kInvalidShelfID; |
71 | 72 |
72 // Running status. | 73 // Running status. |
73 ShelfItemStatus status = STATUS_CLOSED; | 74 ShelfItemStatus status = STATUS_CLOSED; |
| 75 |
| 76 // The application id for this shelf item; only populated for some items. |
| 77 std::string app_id; |
74 }; | 78 }; |
75 | 79 |
76 typedef std::vector<ShelfItem> ShelfItems; | 80 typedef std::vector<ShelfItem> ShelfItems; |
77 | 81 |
78 } // namespace ash | 82 } // namespace ash |
79 | 83 |
80 #endif // ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ | 84 #endif // ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ |
OLD | NEW |