| Index: ui/wm/core/transient_window_manager.cc
|
| diff --git a/ui/wm/core/transient_window_manager.cc b/ui/wm/core/transient_window_manager.cc
|
| index 3008853bf2844c22f672713162ff50c84041f2cc..3bde9721fe8838d7cf662e468fbb1b388cdf7c0e 100644
|
| --- a/ui/wm/core/transient_window_manager.cc
|
| +++ b/ui/wm/core/transient_window_manager.cc
|
| @@ -10,8 +10,8 @@
|
| #include "base/auto_reset.h"
|
| #include "ui/aura/client/transient_window_client_observer.h"
|
| #include "ui/aura/window.h"
|
| -#include "ui/aura/window_property.h"
|
| #include "ui/aura/window_tracker.h"
|
| +#include "ui/base/class_property.h"
|
| #include "ui/wm/core/transient_window_controller.h"
|
| #include "ui/wm/core/transient_window_observer.h"
|
| #include "ui/wm/core/transient_window_stacking_client.h"
|
| @@ -19,12 +19,12 @@
|
|
|
| using aura::Window;
|
|
|
| -DECLARE_WINDOW_PROPERTY_TYPE(wm::TransientWindowManager*);
|
| +DECLARE_UI_CLASS_PROPERTY_TYPE(::wm::TransientWindowManager*);
|
|
|
| namespace wm {
|
| namespace {
|
|
|
| -DEFINE_OWNED_WINDOW_PROPERTY_KEY(TransientWindowManager, kPropertyKey, NULL);
|
| +DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(TransientWindowManager, kPropertyKey, NULL);
|
|
|
| } // namespace
|
|
|
|
|