| Index: ash/common/wm/container_finder.cc
|
| diff --git a/ash/common/wm/container_finder.cc b/ash/common/wm/container_finder.cc
|
| index 60785c75c48e6905f1864cd6f62024c417d1d9e5..d29ebcee419a2131b1c0211d73a155d50f2afb54 100644
|
| --- a/ash/common/wm/container_finder.cc
|
| +++ b/ash/common/wm/container_finder.cc
|
| @@ -11,6 +11,7 @@
|
| #include "ash/common/wm_root_window_controller.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| +#include "ash/common/wm_window_property.h"
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| @@ -91,7 +92,7 @@ WmWindow* GetDefaultParent(WmWindow* context,
|
| return target_root->GetChildByShellWindowId(
|
| kShellWindowId_UnparentedControlContainer);
|
| case ui::wm::WINDOW_TYPE_PANEL:
|
| - if (window->GetWindowState()->panel_attached())
|
| + if (window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED))
|
| return target_root->GetChildByShellWindowId(
|
| kShellWindowId_PanelContainer);
|
| return GetContainerFromAlwaysOnTopController(target_root, window);
|
|
|