Chromium Code Reviews Chromium Code Reviews
Issue 2750463009:
mash: Fix ShelfItem mojo struct; add enums and traits. (Closed)
| OLD | NEW |
|---|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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_PUBLIC_CPP_SHELF_ITEM_H_ |
| 6 #define ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ | 6 #define ASH_PUBLIC_CPP_SHELF_ITEM_H_ |
| 7 | |
| 8 // TODO(msw): Rename these files to shelf_item.*; audit users. | |
|
James Cook
2017/03/16 16:48:50
TODONE! :-)
msw
2017/03/16 23:15:50
:)
| |
| 9 | 7 |
| 10 #include <string> | 8 #include <string> |
| 11 #include <vector> | 9 #include <vector> |
| 12 | 10 |
| 13 #include "ash/ash_export.h" | 11 #include "ash/public/cpp/ash_public_export.h" |
| 14 #include "ash/public/cpp/shelf_types.h" | 12 #include "ash/public/cpp/shelf_types.h" |
| 15 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
| 16 #include "ui/gfx/image/image_skia.h" | 14 #include "ui/gfx/image/image_skia.h" |
| 17 | 15 |
| 18 namespace ash { | 16 namespace ash { |
| 19 | 17 |
| 20 struct ASH_EXPORT ShelfItem { | 18 struct ASH_PUBLIC_EXPORT ShelfItem { |
| 21 ShelfItem(); | 19 ShelfItem(); |
| 22 ShelfItem(const ShelfItem& shelf_item); | 20 ShelfItem(const ShelfItem& shelf_item); |
| 23 ~ShelfItem(); | 21 ~ShelfItem(); |
| 24 | 22 |
| 25 ShelfItemType type = TYPE_UNDEFINED; | 23 ShelfItemType type = TYPE_UNDEFINED; |
| 26 | 24 |
| 27 // Image to display in the shelf. | 25 // Image to display in the shelf. |
| 28 gfx::ImageSkia image; | 26 gfx::ImageSkia image; |
| 29 | 27 |
| 30 // Assigned by the model when the item is added. | 28 // Assigned by the model when the item is added. |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 43 bool shows_tooltip = true; | 41 bool shows_tooltip = true; |
| 44 | 42 |
| 45 // Whether the item is pinned by a policy preference (ie. user cannot un-pin). | 43 // Whether the item is pinned by a policy preference (ie. user cannot un-pin). |
| 46 bool pinned_by_policy = false; | 44 bool pinned_by_policy = false; |
| 47 }; | 45 }; |
| 48 | 46 |
| 49 typedef std::vector<ShelfItem> ShelfItems; | 47 typedef std::vector<ShelfItem> ShelfItems; |
| 50 | 48 |
| 51 } // namespace ash | 49 } // namespace ash |
| 52 | 50 |
| 53 #endif // ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ | 51 #endif // ASH_PUBLIC_CPP_SHELF_ITEM_H_ |
| OLD | NEW |
