Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
index bc0324c13ebff0d22df92f7fb9359a5cb9e81d0d..54d6d1df891572432ae80ff68611082dfaa97a26 100644 |
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
@@ -17,8 +17,8 @@ |
#include "ui/aura/client/window_parenting_client.h" |
#include "ui/aura/window.h" |
#include "ui/aura/window_observer.h" |
-#include "ui/aura/window_property.h" |
#include "ui/aura/window_tree_host.h" |
+#include "ui/base/class_property.h" |
#include "ui/base/hit_test.h" |
#include "ui/base/ime/input_method.h" |
#include "ui/compositor/layer.h" |
@@ -61,12 +61,12 @@ |
#include "ui/base/win/shell.h" |
#endif |
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT, |
+DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, |
views::DesktopNativeWidgetAura*); |
namespace views { |
-DEFINE_WINDOW_PROPERTY_KEY(DesktopNativeWidgetAura*, |
+DEFINE_UI_CLASS_PROPERTY_KEY(DesktopNativeWidgetAura*, |
kDesktopNativeWidgetAuraKey, NULL); |
namespace { |