Refactor and push window properties up to class properties.

ui/aura/client/visibility_client.cc

Index: ui/aura/client/visibility_client.cc
diff --git a/ui/aura/client/visibility_client.cc b/ui/aura/client/visibility_client.cc
index 853c034951f72e795b69581dc5d9cb51329d71cb..5cd637f30edf2f1f8a2c6750aac9b226b5874f0a 100644
--- a/ui/aura/client/visibility_client.cc
+++ b/ui/aura/client/visibility_client.cc
@@ -4,16 +4,17 @@
 
 #include "ui/aura/client/visibility_client.h"
 
+#include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(aura::client::VisibilityClient*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::VisibilityClient*)
 
 namespace aura {
 namespace client {
 
 // A property key to store a client that handles window visibility changes.
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY(
+DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY(
     VisibilityClient*, kWindowVisibilityClientKey, NULL);