Index: ui/wm/public/activation_change_observer.cc |
diff --git a/ui/wm/public/activation_change_observer.cc b/ui/wm/public/activation_change_observer.cc |
index 7fcbb7ae836e6e72231a2aa388af6c62dff102e2..6357a2d14a5c058315b081d6b4a7d5aabff1e0e2 100644 |
--- a/ui/wm/public/activation_change_observer.cc |
+++ b/ui/wm/public/activation_change_observer.cc |
@@ -5,14 +5,14 @@ |
#include "ui/wm/public/activation_change_observer.h" |
#include "ui/aura/window.h" |
-#include "ui/aura/window_property.h" |
+#include "ui/base/class_property.h" |
-DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ActivationChangeObserver*) |
+DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::ActivationChangeObserver*) |
namespace aura { |
namespace client { |
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY( |
+DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY( |
ActivationChangeObserver*, kActivationChangeObserverKey, NULL); |
void SetActivationChangeObserver( |