mash: Remove shelf util functions; use WmWindow properties.

ash/common/shelf/shelf_item_types.h

Index: ash/common/shelf/shelf_item_types.h
diff --git a/ash/common/shelf/shelf_item_types.h b/ash/common/shelf/shelf_item_types.h
index ac9e0864a62fea38dc8590c9194a7fe0f043ffc8..11a94114879a2ff55f3b93428ce957deaf6a230c 100644
--- a/ash/common/shelf/shelf_item_types.h
+++ b/ash/common/shelf/shelf_item_types.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_constants.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ -58,34 +59,27 @@ enum ShelfItemStatus {
 };
 
 struct ASH_EXPORT ShelfItem {
-  ShelfItem();
-  ~ShelfItem();
-
-  ShelfItemType type;
+  ShelfItemType type = TYPE_UNDEFINED;

[James Cook, 2016/09/14 22:07:10]

aside: It's a bummer that the ash global namespace is polluted with
ash::TYPE_UNDEFINED.

If there's a future CL that touches a bunch of references to the ShelfItemType
enum that might be a good time to switch to enum class.

[msw, 2016/09/14 22:29:15]

Acknowledged.

 
   // Image to display in the shelf.
   gfx::ImageSkia image;

[James Cook, 2016/09/14 22:07:10]

optional: Given that ImageSkia has a non-trivial constructor, do you think it's
worth preserving the .cc file and having a non-inlined constructor for this
class?

I'm not sure what our threshold is.

[msw, 2016/09/14 22:29:14]

Done.

 
   // Assigned by the model when the item is added.
-  ShelfID id;
+  ShelfID id = kInvalidShelfID;
 
   // Running status.
-  ShelfItemStatus status;
+  ShelfItemStatus status = STATUS_CLOSED;
 };
 
 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.
+// Windows with ShelfItemDetails appear in the shelf.
+// See ShelfWindowWatcher for details.
 struct ASH_EXPORT ShelfItemDetails {
-  ShelfItemDetails();
-  ~ShelfItemDetails();
-
-  ShelfItemType type;
+  ShelfItemType type = TYPE_UNDEFINED;
 
   // Resource id of the image to display on the shelf.
-  int image_resource_id;
+  int image_resource_id = kInvalidImageResourceID;
 
   // Title of the item.
   base::string16 title;