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 baba5ca7f1819823f2f9ec8f2b88db71b713d897..bc7495123d0524ad2ce01232a2f4e96ecb36b85c 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 { |
@@ -417,14 +417,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); |