| Index: ui/wm/public/activation_delegate.cc
|
| diff --git a/ui/wm/public/activation_delegate.cc b/ui/wm/public/activation_delegate.cc
|
| index 2a9bbc951d77b29b6e048d0d38112fe79e900f56..a548d0515cadd27d3e04c2968fe956437df85365 100644
|
| --- a/ui/wm/public/activation_delegate.cc
|
| +++ b/ui/wm/public/activation_delegate.cc
|
| @@ -5,14 +5,14 @@
|
| #include "ui/wm/public/activation_delegate.h"
|
|
|
| #include "ui/aura/window.h"
|
| -#include "ui/aura/window_property.h"
|
| +#include "ui/base/class_property.h"
|
|
|
| -DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ActivationDelegate*)
|
| +DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::ActivationDelegate*)
|
|
|
| namespace aura {
|
| namespace client {
|
|
|
| -DEFINE_LOCAL_WINDOW_PROPERTY_KEY(
|
| +DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY(
|
| ActivationDelegate*, kActivationDelegateKey, NULL);
|
|
|
| void SetActivationDelegate(Window* window, ActivationDelegate* delegate) {
|
|
|