mash: Serialize ShelfIDs for property conversion and transport.

ash/public/cpp/window_properties.cc

Index: ash/public/cpp/window_properties.cc
diff --git a/ash/public/cpp/window_properties.cc b/ash/public/cpp/window_properties.cc
index 4c065685b77f3e803f2f40989d936189ce02a6fd..5b5d42f9b636b91bf75679f6ea73a744d133a71f 100644
--- a/ash/public/cpp/window_properties.cc
+++ b/ash/public/cpp/window_properties.cc
@@ -4,19 +4,19 @@
 
 #include "ash/public/cpp/window_properties.h"
 
+#include "ash/public/cpp/shelf_types.h"
 #include "ash/public/interfaces/window_pin_type.mojom.h"
 
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_PUBLIC_EXPORT,
                                         ash::mojom::WindowPinType)
-DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_PUBLIC_EXPORT, ash::ShelfID*);
 
 namespace ash {
 
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPanelAttachedKey, true);
-DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, nullptr);
+DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kShelfIDKey, nullptr);
 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED);
-DEFINE_UI_CLASS_PROPERTY_KEY(ash::mojom::WindowPinType,
+DEFINE_UI_CLASS_PROPERTY_KEY(mojom::WindowPinType,
                              kWindowPinTypeKey,
-                             ash::mojom::WindowPinType::NONE);
+                             mojom::WindowPinType::NONE);
 
 }  // namespace ash