Refactor and push window properties up to class properties.

ui/wm/core/shadow_types.cc

Index: ui/wm/core/shadow_types.cc
diff --git a/ui/wm/core/shadow_types.cc b/ui/wm/core/shadow_types.cc
index 37720ec23069a18c25cd1200137dc9b27ab19040..8d133412465babd148bff7cff07089e9218726c2 100644
--- a/ui/wm/core/shadow_types.cc
+++ b/ui/wm/core/shadow_types.cc
@@ -4,9 +4,9 @@
 
 #include "ui/wm/core/shadow_types.h"
 
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(wm::ShadowElevation);
+DECLARE_UI_CLASS_PROPERTY_TYPE(::wm::ShadowElevation);
 
 namespace wm {
 
@@ -18,8 +18,8 @@ ShadowElevation GetShadowElevation(aura::Window* window) {
   return window->GetProperty(kShadowElevationKey);
 }
 
-DEFINE_WINDOW_PROPERTY_KEY(ShadowElevation,
-                           kShadowElevationKey,
-                           ShadowElevation::NONE);
+DEFINE_UI_CLASS_PROPERTY_KEY(ShadowElevation,
+                          kShadowElevationKey,
+                          ShadowElevation::NONE);
 
 }  // namespace wm