| Index: ui/aura/mus/window_port_mus.cc
|
| diff --git a/ui/aura/mus/window_port_mus.cc b/ui/aura/mus/window_port_mus.cc
|
| index 8fdf62b0de3c66c053ea0ab8b80a653273b4e9fd..12db96881a545241444e76834d9164a9cd5a0ddc 100644
|
| --- a/ui/aura/mus/window_port_mus.cc
|
| +++ b/ui/aura/mus/window_port_mus.cc
|
| @@ -14,7 +14,7 @@
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_delegate.h"
|
| #include "ui/aura/window_observer.h"
|
| -#include "ui/aura/window_property.h"
|
| +#include "ui/base/class_property.h"
|
|
|
| namespace aura {
|
|
|
| @@ -415,14 +415,14 @@ void WindowPortMus::OnDidChangeBounds(const gfx::Rect& old_bounds,
|
| window_tree_client_->OnWindowMusBoundsChanged(this, old_bounds, new_bounds);
|
| }
|
|
|
| -std::unique_ptr<WindowPortPropertyData> WindowPortMus::OnWillChangeProperty(
|
| +std::unique_ptr<ui::PropertyData> WindowPortMus::OnWillChangeProperty(
|
| const void* key) {
|
| return window_tree_client_->OnWindowMusWillChangeProperty(this, key);
|
| }
|
|
|
| void WindowPortMus::OnPropertyChanged(
|
| const void* key,
|
| - std::unique_ptr<WindowPortPropertyData> data) {
|
| + std::unique_ptr<ui::PropertyData> data) {
|
| ServerChangeData change_data;
|
| change_data.property_name =
|
| GetPropertyConverter()->GetTransportNameForPropertyKey(key);
|
|
|