mash: Convert ShelfWindowWatcher to wm common types

ash/aura/wm_window_aura.cc

Index: ash/aura/wm_window_aura.cc
diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
index 82a18dd4ab68793f972c2539c234b87964839341..23a1556ac094bf00ee9298df981e2303bd5e49c4 100644
--- a/ash/aura/wm_window_aura.cc
+++ b/ash/aura/wm_window_aura.cc
@@ -278,6 +278,19 @@ int WmWindowAura::GetIntProperty(WmWindowProperty key) {
   return 0;
 }
 
+void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
+  if (key == WmWindowProperty::SHELF_ID) {
+    SetShelfIDForWindow(value, window_);
+    return;
+  }
+
+  NOTREACHED();
+}
+
+ShelfItemDetails* WmWindowAura::GetShelfItemDetails() {
+  return window_->GetProperty(kShelfItemDetailsKey);
+}
+
 const wm::WindowState* WmWindowAura::GetWindowState() const {
   return ash::wm::GetWindowState(window_);
 }
@@ -710,6 +723,8 @@ void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
     wm_property = WmWindowProperty::ALWAYS_ON_TOP;
   } else if (key == kShelfID) {
     wm_property = WmWindowProperty::SHELF_ID;
+  } else if (key == kShelfItemDetailsKey) {
+    wm_property = WmWindowProperty::SHELF_ITEM_DETAILS;
   } else if (key == aura::client::kTopViewInset) {
     wm_property = WmWindowProperty::TOP_VIEW_INSET;
   } else if (key == aura::client::kExcludeFromMruKey) {