| Index: ash/mus/bridge/workspace_event_handler_mus.cc
|
| diff --git a/ash/mus/bridge/workspace_event_handler_mus.cc b/ash/mus/bridge/workspace_event_handler_mus.cc
|
| index ae03b4f3e6260e94bb9d38897fd9678ffde7b35b..1b2a1a9db389192d55bd3d3ec55781c078377113 100644
|
| --- a/ash/mus/bridge/workspace_event_handler_mus.cc
|
| +++ b/ash/mus/bridge/workspace_event_handler_mus.cc
|
| @@ -5,15 +5,15 @@
|
| #include "ash/mus/bridge/workspace_event_handler_mus.h"
|
|
|
| #include "ui/aura/window.h"
|
| -#include "ui/aura/window_property.h"
|
| +#include "ui/base/class_property.h"
|
|
|
| -DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WorkspaceEventHandlerMus*);
|
| +DECLARE_UI_CLASS_PROPERTY_TYPE(ash::mus::WorkspaceEventHandlerMus*);
|
|
|
| namespace {
|
|
|
| -DEFINE_WINDOW_PROPERTY_KEY(ash::mus::WorkspaceEventHandlerMus*,
|
| - kWorkspaceEventHandlerProperty,
|
| - nullptr);
|
| +DEFINE_UI_CLASS_PROPERTY_KEY(ash::mus::WorkspaceEventHandlerMus*,
|
| + kWorkspaceEventHandlerProperty,
|
| + nullptr);
|
|
|
| } // namespace
|
|
|
|
|