Refactor and push window properties up to class properties.

ui/wm/public/tooltip_client.cc

Index: ui/wm/public/tooltip_client.cc
diff --git a/ui/wm/public/tooltip_client.cc b/ui/wm/public/tooltip_client.cc
index c9fd6f894de9311bf5eca699a05e8f1953ed7172..ef8390de56f2fa563bc0bfea7203fb351c1e1680 100644
--- a/ui/wm/public/tooltip_client.cc
+++ b/ui/wm/public/tooltip_client.cc
@@ -4,17 +4,19 @@
 
 #include "ui/wm/public/tooltip_client.h"
 
-#include "ui/aura/window_property.h"
+#include "ui/aura/window.h"
+#include "ui/base/class_property.h"
 
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::client::TooltipClient*)
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void**)
+DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT,
+                                        aura::client::TooltipClient*)
+DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, void**)
 
 namespace aura {
 namespace client {
 
-DEFINE_WINDOW_PROPERTY_KEY(TooltipClient*, kRootWindowTooltipClientKey, NULL);
-DEFINE_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL);
-DEFINE_WINDOW_PROPERTY_KEY(void*, kTooltipIdKey, NULL);
+DEFINE_UI_CLASS_PROPERTY_KEY(TooltipClient*, kRootWindowTooltipClientKey, NULL);
+DEFINE_UI_CLASS_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL);
+DEFINE_UI_CLASS_PROPERTY_KEY(void*, kTooltipIdKey, NULL);
 
 void SetTooltipClient(Window* root_window, TooltipClient* client) {
   DCHECK_EQ(root_window->GetRootWindow(), root_window);