Refactor and push window properties up to class properties.

ui/wm/public/tooltip_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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);
   root_window->SetProperty(kRootWindowTooltipClientKey, client);
 }
 
 TooltipClient* GetTooltipClient(Window* root_window) {
   if (root_window)
     DCHECK_EQ(root_window->GetRootWindow(), root_window);
   return root_window ?
@@ skipping 12 matching lines @@
   base::string16* string_ptr = window->GetProperty(kTooltipTextKey);
   return string_ptr ? *string_ptr : base::string16();
 }
 
 const void* GetTooltipId(Window* window) {
   return window->GetProperty(kTooltipIdKey);
 }
 
 }  // namespace client
 }  // namespace aura