Index: ash/wm/panels/panel_window_resizer.cc |
diff --git a/ash/wm/panels/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc |
index 606a7e81406a2cdc3fb14804c36eaaa41a6d72a4..dcd45595a0596a0f4cea45d33cd853ddd18ebcd6 100644 |
--- a/ash/wm/panels/panel_window_resizer.cc |
+++ b/ash/wm/panels/panel_window_resizer.cc |
@@ -13,8 +13,7 @@ |
#include "ash/shell_window_ids.h" |
#include "ash/wm/coordinate_conversion.h" |
#include "ash/wm/panels/panel_layout_manager.h" |
-#include "ash/wm/property_util.h" |
-#include "ash/wm/window_settings.h" |
+#include "ash/wm/window_state.h" |
#include "base/memory/weak_ptr.h" |
#include "ui/aura/client/aura_constants.h" |
#include "ui/aura/env.h" |
@@ -130,7 +129,7 @@ PanelWindowResizer::PanelWindowResizer(WindowResizer* next_window_resizer, |
panel_container_(NULL), |
initial_panel_container_(NULL), |
did_move_or_resize_(false), |
- was_attached_(wm::GetWindowSettings(GetTarget())->panel_attached()), |
+ was_attached_(wm::GetWindowState(GetTarget())->panel_attached()), |
should_attach_(was_attached_), |
weak_ptr_factory_(this) { |
DCHECK(details_.is_resizable); |
@@ -191,8 +190,8 @@ void PanelWindowResizer::StartedDragging() { |
GetPanelLayoutManager(panel_container_)->StartDragging(GetTarget()); |
if (!was_attached_) { |
// Attach the panel while dragging placing it in front of other panels. |
- wm::GetWindowSettings(GetTarget())->set_continue_drag_after_reparent(true); |
- wm::GetWindowSettings(GetTarget())->set_panel_attached(true); |
+ wm::GetWindowState(GetTarget())->set_continue_drag_after_reparent(true); |
+ wm::GetWindowState(GetTarget())->set_panel_attached(true); |
// We use root window coordinates to ensure that during the drag the panel |
// is reparented to a container in the root window that has that window. |
GetTarget()->SetDefaultParentByRootWindow( |
@@ -204,8 +203,8 @@ void PanelWindowResizer::StartedDragging() { |
void PanelWindowResizer::FinishDragging() { |
if (!did_move_or_resize_) |
return; |
- if (wm::GetWindowSettings(GetTarget())->panel_attached() != should_attach_) { |
- wm::GetWindowSettings(GetTarget())->set_panel_attached(should_attach_); |
+ if (wm::GetWindowState(GetTarget())->panel_attached() != should_attach_) { |
+ wm::GetWindowState(GetTarget())->set_panel_attached(should_attach_); |
// We use last known location to ensure that after the drag the panel |
// is reparented to a container in the root window that has that location. |
GetTarget()->SetDefaultParentByRootWindow( |