Refactor and push window properties up to class properties.

ash/mus/disconnected_app_handler.cc

Index: ash/mus/disconnected_app_handler.cc
diff --git a/ash/mus/disconnected_app_handler.cc b/ash/mus/disconnected_app_handler.cc
index cfc75fc4a7febbe4c830ec2367dca7325ac3848a..21ca7c61f06669fad5de2682ffcdf06b50ed3845 100644
--- a/ash/mus/disconnected_app_handler.cc
+++ b/ash/mus/disconnected_app_handler.cc
@@ -7,17 +7,17 @@
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::DisconnectedAppHandler*);
+DECLARE_UI_CLASS_PROPERTY_TYPE(ash::mus::DisconnectedAppHandler*);
 
 namespace ash {
 namespace mus {
 namespace {
 
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(DisconnectedAppHandler,
-                                 kDisconnectedAppHandlerKey,
-                                 nullptr);
+DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DisconnectedAppHandler,
+                                   kDisconnectedAppHandlerKey,
+                                   nullptr);
 
 }  // namespace