Refactor and push window properties up to class properties.

ash/aura/aura_layout_manager_adapter.cc

 // Copyright 2016 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 "ash/aura/aura_layout_manager_adapter.h"
 
 #include "ash/common/wm_layout_manager.h"
 #include "ash/common/wm_window.h"
-#include "ui/aura/window_property.h"
+#include "ui/aura/window.h"
+#include "ui/base/class_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::AuraLayoutManagerAdapter*);
+DECLARE_UI_CLASS_PROPERTY_TYPE(ash::AuraLayoutManagerAdapter*);
 
 namespace ash {
 namespace {
 // AuraLayoutManagerAdapter is an aura::LayoutManager, so it's owned by the
 // aura::Window it is installed on. This property is used to lookup the
 // AuraLayoutManagerAdapter given only an aura::Window.
-DEFINE_WINDOW_PROPERTY_KEY(AuraLayoutManagerAdapter*,
-                           kAuraLayoutManagerAdapter,
-                           nullptr);
+DEFINE_UI_CLASS_PROPERTY_KEY(AuraLayoutManagerAdapter*,
+                             kAuraLayoutManagerAdapter,
+                             nullptr);
 }  // namespace
 
 AuraLayoutManagerAdapter::AuraLayoutManagerAdapter(
     aura::Window* window,
     std::unique_ptr<WmLayoutManager> wm_layout_manager)
     : window_(window), wm_layout_manager_(std::move(wm_layout_manager)) {
   window->SetProperty(kAuraLayoutManagerAdapter, this);
 }
 
 AuraLayoutManagerAdapter::~AuraLayoutManagerAdapter() {
@@ skipping 32 matching lines @@
                                                      visible);
 }
 
 void AuraLayoutManagerAdapter::SetChildBounds(
     aura::Window* child,
     const gfx::Rect& requested_bounds) {
   wm_layout_manager_->SetChildBounds(WmWindow::Get(child), requested_bounds);
 }
 
 }  // namespace ash