Index: ash/common/wm_window.cc |
diff --git a/ash/common/wm_window.cc b/ash/common/wm_window.cc |
index f7e86e1ed49bda6b80f80ef83918798d38ccde5b..25db9e55eb70b71cc457568e0d0fe643eec16900 100644 |
--- a/ash/common/wm_window.cc |
+++ b/ash/common/wm_window.cc |
@@ -36,7 +36,7 @@ |
#include "ui/aura/mus/window_tree_client.h" |
#include "ui/aura/window.h" |
#include "ui/aura/window_delegate.h" |
-#include "ui/aura/window_property.h" |
+#include "ui/base/class_property.h" |
#include "ui/base/hit_test.h" |
#include "ui/compositor/layer_tree_owner.h" |
#include "ui/compositor/scoped_layer_animation_settings.h" |
@@ -50,11 +50,11 @@ |
#include "ui/wm/core/visibility_controller.h" |
#include "ui/wm/core/window_util.h" |
-DECLARE_WINDOW_PROPERTY_TYPE(ash::WmWindow*); |
+DECLARE_UI_CLASS_PROPERTY_TYPE(ash::WmWindow*); |
namespace ash { |
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(WmWindow, kWmWindowKey, nullptr); |
+DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WmWindow, kWmWindowKey, nullptr); |
static_assert(aura::Window::kInitialId == kShellWindowId_Invalid, |
"ids must match"); |