| Index: ash/wm/panels/panel_layout_manager.cc
|
| diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc
|
| index 65f15e69ab1c4bf6daa62374e0cd1eda536f2a24..8e3d80f68d1f5b4c4529810f1f7dadfd88b2a3e8 100644
|
| --- a/ash/wm/panels/panel_layout_manager.cc
|
| +++ b/ash/wm/panels/panel_layout_manager.cc
|
| @@ -15,9 +15,8 @@
|
| #include "ash/shell.h"
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/wm/frame_painter.h"
|
| -#include "ash/wm/property_util.h"
|
| #include "ash/wm/window_animations.h"
|
| -#include "ash/wm/window_settings.h"
|
| +#include "ash/wm/window_state.h"
|
| #include "ash/wm/window_util.h"
|
| #include "base/auto_reset.h"
|
| #include "base/bind.h"
|
| @@ -342,7 +341,7 @@ void PanelLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
|
| if (in_add_window_)
|
| return;
|
| base::AutoReset<bool> auto_reset_in_add_window(&in_add_window_, true);
|
| - if (!wm::GetWindowSettings(child)->panel_attached()) {
|
| + if (!wm::GetWindowState(child)->panel_attached()) {
|
| // This should only happen when a window is added to panel container as a
|
| // result of bounds change from within the application during a drag.
|
| // If so we have already stopped the drag and should reparent the panel
|
|
|