| Index: ui/aura/client/drag_drop_client.cc
|
| diff --git a/ui/aura/client/drag_drop_client.cc b/ui/aura/client/drag_drop_client.cc
|
| index 41a04a810442238563fd6b75b7cee1a7c5f35914..89e16f678d7403f5ce517d8ce64e796e9f0644fa 100644
|
| --- a/ui/aura/client/drag_drop_client.cc
|
| +++ b/ui/aura/client/drag_drop_client.cc
|
| @@ -5,14 +5,14 @@
|
| #include "ui/aura/client/drag_drop_client.h"
|
|
|
| #include "ui/aura/window.h"
|
| -#include "ui/aura/window_property.h"
|
| +#include "ui/base/class_property.h"
|
|
|
| -DECLARE_WINDOW_PROPERTY_TYPE(aura::client::DragDropClient*)
|
| +DECLARE_CLASS_PROPERTY_TYPE(aura::client::DragDropClient*)
|
|
|
| namespace aura {
|
| namespace client {
|
|
|
| -DEFINE_LOCAL_WINDOW_PROPERTY_KEY(
|
| +DEFINE_LOCAL_CLASS_PROPERTY_KEY(
|
| DragDropClient*, kRootWindowDragDropClientKey, NULL);
|
|
|
| void SetDragDropClient(Window* root_window, DragDropClient* client) {
|
|
|