| Index: ash/common/wm/container_finder.cc
|
| diff --git a/ash/common/wm/container_finder.cc b/ash/common/wm/container_finder.cc
|
| index f859279fce19164a9db642287d96e062f7b47fe3..ece5ca950a23442a1d38eb6d16ff3fbdfaac5336 100644
|
| --- a/ash/common/wm/container_finder.cc
|
| +++ b/ash/common/wm/container_finder.cc
|
| @@ -10,8 +10,8 @@
|
| #include "ash/common/wm/window_state.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 "ash/public/cpp/window_properties.h"
|
| #include "ash/root_window_controller.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| @@ -92,7 +92,7 @@ WmWindow* GetDefaultParent(WmWindow* context,
|
| return target_root->GetChildByShellWindowId(
|
| kShellWindowId_UnparentedControlContainer);
|
| case ui::wm::WINDOW_TYPE_PANEL:
|
| - if (window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED))
|
| + if (window->aura_window()->GetProperty(kPanelAttachedKey))
|
| return target_root->GetChildByShellWindowId(
|
| kShellWindowId_PanelContainer);
|
| return GetContainerFromAlwaysOnTopController(target_root, window);
|
|
|