Refactor and push window properties up to class properties.

ui/aura/client/event_client.cc

Index: ui/aura/client/event_client.cc
diff --git a/ui/aura/client/event_client.cc b/ui/aura/client/event_client.cc
index d6da07e4245897feb9cc5459f9bf385e40f8285d..b83fec1d3c331ef57812462a795285321825ff6a 100644
--- a/ui/aura/client/event_client.cc
+++ b/ui/aura/client/event_client.cc
@@ -4,15 +4,16 @@
 
 #include "ui/aura/client/event_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::EventClient*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::EventClient*)
 
 namespace aura {
 namespace client {
 
-DEFINE_WINDOW_PROPERTY_KEY(EventClient*, kRootWindowEventClientKey, NULL);
+DEFINE_UI_CLASS_PROPERTY_KEY(EventClient*, kRootWindowEventClientKey, NULL);
 
 void SetEventClient(Window* root_window, EventClient* client) {
   DCHECK_EQ(root_window->GetRootWindow(), root_window);