Fork a subset of ash/shelf for use in mash.

mash/shelf/shelf_item_types.h

Index: mash/shelf/shelf_item_types.h
diff --git a/ash/shelf/shelf_item_types.h b/mash/shelf/shelf_item_types.h
similarity index 74%
copy from ash/shelf/shelf_item_types.h
copy to mash/shelf/shelf_item_types.h
index 9dc83551a536fe3527d31eda92ccdb0369ff673e..de46bc994ffff7bdb3f4b73108bd600a4472c595 100644
--- a/ash/shelf/shelf_item_types.h
+++ b/mash/shelf/shelf_item_types.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SHELF_SHELF_ITEM_TYPES_H_
-#define ASH_SHELF_SHELF_ITEM_TYPES_H_
+#ifndef MASH_SHELF_SHELF_ITEM_TYPES_H_
+#define MASH_SHELF_SHELF_ITEM_TYPES_H_
 
 #include <vector>
 
-#include "ash/ash_export.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image_skia.h"
 
-namespace ash {
+namespace mash {
+namespace shelf {
 
 typedef int ShelfID;
 
@@ -38,6 +38,9 @@ enum ShelfItemType {
   // Represents a dialog.
   TYPE_DIALOG,
 
+  // TODO(msw): Integrate mojo apps with another enum type.
+  TYPE_MOJO_APP,
+
   // Default value.
   TYPE_UNDEFINED,
 };
@@ -54,7 +57,7 @@ enum ShelfItemStatus {
   STATUS_ATTENTION,
 };
 
-struct ASH_EXPORT ShelfItem {
+struct ShelfItem {
   ShelfItem();
   ~ShelfItem();
 
@@ -68,26 +71,22 @@ struct ASH_EXPORT ShelfItem {
 
   // Running status.
   ShelfItemStatus status;
-};
-
-typedef std::vector<ShelfItem> ShelfItems;
 
-// ShelfItemDetails may be set on Window (by way of
-// SetShelfItemDetailsForWindow) to make the window appear in the shelf. See
-// ShelfWindowWatcher for details.
-struct ASH_EXPORT ShelfItemDetails {
-  ShelfItemDetails();
-  ~ShelfItemDetails();
-
-  ShelfItemType type;
+  // The id of an associated open window.
+  // TODO(msw): Support multiple open windows per button.
+  uint32_t window_id;
 
   // Resource id of the image to display on the shelf.
-  int image_resource_id;
+  // TODO(msw): Support window icons on the shelf.
+  //int image_resource_id;
 
   // Title of the item.
   base::string16 title;
 };
 
-}  // namespace ash
+typedef std::vector<ShelfItem> ShelfItems;
+
+}  // namespace shelf
+}  // namespace mash
 
-#endif  // ASH_SHELF_SHELF_ITEM_TYPES_H_
+#endif  // MASH_SHELF_SHELF_ITEM_TYPES_H_