Refactor and push window properties up to class properties.

ui/aura/client/screen_position_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/aura/client/screen_position_client.h"
 
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ScreenPositionClient*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::ScreenPositionClient*)
 
 namespace aura {
 namespace client {
 
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ScreenPositionClient*,
-                                 kScreenPositionClientKey,
-                                 NULL);
+DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY(ScreenPositionClient*,
+                                kScreenPositionClientKey,
+                                NULL);
 
 void SetScreenPositionClient(Window* root_window,
                              ScreenPositionClient* client) {
   DCHECK_EQ(root_window->GetRootWindow(), root_window);
   root_window->SetProperty(kScreenPositionClientKey, client);
 }
 
 ScreenPositionClient* GetScreenPositionClient(const Window* root_window) {
   if (root_window)
     DCHECK_EQ(root_window->GetRootWindow(), root_window);
   return root_window ?
       root_window->GetProperty(kScreenPositionClientKey) : NULL;
 }
 
 }  // namespace client
 }  // namespace aura