Refactor and push window properties up to class properties.

ui/aura/client/window_parenting_client.cc

 // Copyright (c) 2013 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/window_parenting_client.h"
 
 #include "ui/aura/env.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::WindowParentingClient*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::WindowParentingClient*)
 
 namespace aura {
 namespace client {
 
-DEFINE_WINDOW_PROPERTY_KEY(WindowParentingClient*,
-                           kRootWindowWindowParentingClientKey,
-                           NULL);
+DEFINE_UI_CLASS_PROPERTY_KEY(WindowParentingClient*,
+                          kRootWindowWindowParentingClientKey,
+                          NULL);
 
 void SetWindowParentingClient(Window* window,
                               WindowParentingClient* window_tree_client) {
   DCHECK(window);
 
   Window* root_window = window->GetRootWindow();
   DCHECK(root_window);
   root_window->SetProperty(kRootWindowWindowParentingClientKey,
                            window_tree_client);
 }
@@ skipping 16 matching lines @@
   // |context| must be attached to a hierarchy with a WindowParentingClient.
   WindowParentingClient* client = GetWindowParentingClient(context);
   DCHECK(client);
   Window* default_parent =
       client->GetDefaultParent(context, window, screen_bounds);
   default_parent->AddChild(window);
 }
 
 }  // namespace client
 }  // namespace aura