Remove WmWindowProperty

ash/common/shelf/shelf_widget.cc

Index: ash/common/shelf/shelf_widget.cc
diff --git a/ash/common/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc
index 4e3ecf161c8aebabe4f8e041ae9a5bcd8d2c2bfe..4c54d82306748cd24ea2b4c449e1ca8b9c0a6e93 100644
--- a/ash/common/shelf/shelf_widget.cc
+++ b/ash/common/shelf/shelf_widget.cc
@@ -20,8 +20,8 @@
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/common/wm_window_property.h"
 #include "ash/root_window_controller.h"
+#include "ash/wm/window_properties.h"
 #include "base/memory/ptr_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
@@ -308,7 +308,7 @@ void ShelfWidget::UpdateIconPositionForPanel(WmWindow* panel) {
 
   WmWindow* shelf_window = WmLookup::Get()->GetWindowForWidget(this);
   shelf_view_->UpdatePanelIconPosition(
-      panel->GetIntProperty(WmWindowProperty::SHELF_ID),
+      panel->aura_window()->GetProperty(kShelfIDKey),
       shelf_window->ConvertRectFromScreen(panel->GetBoundsInScreen())
           .CenterPoint());
 }
@@ -319,7 +319,7 @@ gfx::Rect ShelfWidget::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
   if (!shelf_view_)
     return gfx::Rect();
 
-  ShelfID id = window->GetIntProperty(WmWindowProperty::SHELF_ID);
+  ShelfID id = window->aura_window()->GetProperty(kShelfIDKey);
   gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
   gfx::Point screen_origin;
   views::View::ConvertPointToScreen(shelf_view_, &screen_origin);