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 797c9cfdffb61471540eda59a420cf497499056f..248b4d5ff33debf0461ad70828b7d5d5d2fd8909 100644
--- a/ash/common/shelf/shelf_widget.cc
+++ b/ash/common/shelf/shelf_widget.cc
@@ -19,8 +19,8 @@
 #include "ash/common/system/status_area_widget.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"
@@ -307,7 +307,7 @@ void ShelfWidget::UpdateIconPositionForPanel(WmWindow* panel) {
 
   WmWindow* shelf_window = WmWindow::Get(this->GetNativeWindow());
   shelf_view_->UpdatePanelIconPosition(
-      panel->GetIntProperty(WmWindowProperty::SHELF_ID),
+      panel->aura_window()->GetProperty(kShelfIDKey),
       shelf_window->ConvertRectFromScreen(panel->GetBoundsInScreen())
           .CenterPoint());
 }
@@ -318,7 +318,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);