Refactor and push window properties up to class properties.

ash/mus/move_event_handler.cc

 // Copyright 2015 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/mus/move_event_handler.h"
 
 #include "ash/common/wm_window.h"
 #include "ash/mus/bridge/workspace_event_handler_mus.h"
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::MoveEventHandler*);
+DECLARE_UI_CLASS_PROPERTY_TYPE(ash::mus::MoveEventHandler*);
 
 namespace {
 
 // Key used for storing identifier sent to clients for windows.
-DEFINE_WINDOW_PROPERTY_KEY(ash::mus::MoveEventHandler*,
-                           kWmMoveEventHandler,
-                           nullptr);
+DEFINE_UI_CLASS_PROPERTY_KEY(ash::mus::MoveEventHandler*,
+                             kWmMoveEventHandler,
+                             nullptr);
 
 }  // namespace
 
 namespace ash {
 namespace mus {
 namespace {
 
 ui::mojom::Cursor CursorForWindowComponent(int window_component) {
   switch (window_component) {
     case HTBOTTOM:
@@ skipping 111 matching lines @@
   toplevel_window_event_handler_.RevertDrag();
 }
 
 void MoveEventHandler::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(wm_window_->aura_window(), window);
   Detach();
 }
 
 }  // namespace mus
 }  // namespace ash