Chromium Code Reviews| Index: ui/aura/client/window_parenting_client.cc |
| diff --git a/ui/aura/client/window_parenting_client.cc b/ui/aura/client/window_parenting_client.cc |
| index 9d199b149db63bd14d2dc418114376a38b5c6aa6..d667a0263f16c95d73fd9305b8193e4dc20ea075 100644 |
| --- a/ui/aura/client/window_parenting_client.cc |
| +++ b/ui/aura/client/window_parenting_client.cc |
| @@ -5,17 +5,18 @@ |
| #include "ui/aura/client/window_parenting_client.h" |
| #include "ui/aura/env.h" |
| +#include "ui/aura/window.h" |
| #include "ui/aura/window_event_dispatcher.h" |
| -#include "ui/aura/window_property.h" |
| +#include "ui/base/class_property.h" |
|
sky
2017/01/24 18:45:37
Given that you changed window.h to include class_p
kylix_rd
2017/01/24 21:20:00
I was under the impression the idea was that if yo
sky
2017/01/24 22:36:13
Agreed. I think this case is a bit of a gray area
|
| -DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowParentingClient*) |
| +DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::WindowParentingClient*) |
| namespace aura { |
| namespace client { |
| -DEFINE_WINDOW_PROPERTY_KEY(WindowParentingClient*, |
| - kRootWindowWindowParentingClientKey, |
| - NULL); |
| +DEFINE_UI_CLASS_PROPERTY_KEY(WindowParentingClient*, |
| + kRootWindowWindowParentingClientKey, |
| + NULL); |
| void SetWindowParentingClient(Window* window, |
| WindowParentingClient* window_tree_client) { |