Refactor and push window properties up to class properties.

ui/wm/core/visibility_controller.cc

Index: ui/wm/core/visibility_controller.cc
diff --git a/ui/wm/core/visibility_controller.cc b/ui/wm/core/visibility_controller.cc
index fd7bb88ac5ddf6dc599811fcd21c31cf698329b5..89736172886c4833f380dca21752047389bfe51e 100644
--- a/ui/wm/core/visibility_controller.cc
+++ b/ui/wm/core/visibility_controller.cc
@@ -5,7 +5,7 @@
 #include "ui/wm/core/visibility_controller.h"
 
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 #include "ui/compositor/layer.h"
 #include "ui/wm/core/window_animations.h"
 
@@ -15,11 +15,11 @@ namespace {
 
 // Property set on all windows whose child windows' visibility changes are
 // animated.
-DEFINE_WINDOW_PROPERTY_KEY(
+DEFINE_UI_CLASS_PROPERTY_KEY(
     bool, kChildWindowVisibilityChangesAnimatedKey, false);
 
 // A window with this property set will animate upon its visibility changes.
-DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowVisibilityChangesAnimatedKey, false);
+DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowVisibilityChangesAnimatedKey, false);
 
 bool ShouldAnimateWindow(aura::Window* window) {
   return (window->parent() &&