Refactor and push window properties up to class properties.

ash/wm/window_properties.cc

Index: ash/wm/window_properties.cc
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index e4d4c3e4b5151843c1dce4fc0cf93983b1e2d3bb..0a32bfaf3be0c7aed38a85c8676583ad221c9ab3 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -5,35 +5,35 @@
 #include "ash/wm/window_properties.h"
 
 #include "ash/common/wm/window_state.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*);
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType);
+DECLARE_CLASS_PROPERTY_TYPE(ash::wm::WindowState*);
+DECLARE_EXPORTED_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType);
 
 namespace ash {
 
-DEFINE_WINDOW_PROPERTY_KEY(bool, kLockedToRootKey, false);
+DEFINE_CLASS_PROPERTY_KEY(bool, kLockedToRootKey, false);
 
-DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true);
+DEFINE_CLASS_PROPERTY_KEY(bool, kPanelAttachedKey, true);
 
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL);
+DEFINE_OWNED_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL);
 
-DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState,
-                           kRestoreShowStateOverrideKey,
-                           ui::SHOW_STATE_DEFAULT);
+DEFINE_CLASS_PROPERTY_KEY(ui::WindowShowState,
+                          kRestoreShowStateOverrideKey,
+                          ui::SHOW_STATE_DEFAULT);
 
-DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
+DEFINE_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
 
-DEFINE_WINDOW_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED);
+DEFINE_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED);
 
-DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false);
+DEFINE_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false);
 
-DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
+DEFINE_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
 
-DEFINE_WINDOW_PROPERTY_KEY(WidgetCreationType,
-                           kWidgetCreationTypeKey,
-                           WidgetCreationType::INTERNAL);
+DEFINE_CLASS_PROPERTY_KEY(WidgetCreationType,
+                          kWidgetCreationTypeKey,
+                          WidgetCreationType::INTERNAL);
 
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, kWindowStateKey, NULL);
+DEFINE_OWNED_CLASS_PROPERTY_KEY(ash::wm::WindowState, kWindowStateKey, NULL);
 
 }  // namespace ash