| Index: ash/common/wm/drag_details.cc
|
| diff --git a/ash/common/wm/drag_details.cc b/ash/common/wm/drag_details.cc
|
| index 73815a41eff661689edb01ef949a23737c47f3a0..4a9182674e6d0b2b667258a658c350306ac21716 100644
|
| --- a/ash/common/wm/drag_details.cc
|
| +++ b/ash/common/wm/drag_details.cc
|
| @@ -6,7 +6,8 @@
|
|
|
| #include "ash/common/wm/window_resizer.h"
|
| #include "ash/common/wm_window.h"
|
| -#include "ash/common/wm_window_property.h"
|
| +#include "ash/public/cpp/window_properties.h"
|
| +#include "ui/aura/window.h"
|
| #include "ui/base/hit_test.h"
|
| #include "ui/compositor/layer.h"
|
|
|
| @@ -66,7 +67,7 @@ DragDetails::DragDetails(WmWindow* window,
|
| source(source),
|
| should_attach_to_shelf(
|
| window->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
|
| - window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED)) {
|
| + window->aura_window()->GetProperty(kPanelAttachedKey)) {
|
| wm::WindowState* window_state = window->GetWindowState();
|
| if ((window_state->IsNormalOrSnapped() || window_state->IsDocked()) &&
|
| window_state->HasRestoreBounds() && window_component == HTCAPTION) {
|
|
|