| Index: ash/common/wm/workspace/workspace_window_resizer.cc
|
| diff --git a/ash/common/wm/workspace/workspace_window_resizer.cc b/ash/common/wm/workspace/workspace_window_resizer.cc
|
| index e17da97b19f8ebb7c047424ef047b9a8578ccc65..4a712e5bef3875261bdae4e47be1e94256405912 100644
|
| --- a/ash/common/wm/workspace/workspace_window_resizer.cc
|
| +++ b/ash/common/wm/workspace/workspace_window_resizer.cc
|
| @@ -9,6 +9,7 @@
|
| #include <utility>
|
| #include <vector>
|
|
|
| +#include "ash/common/ash_switches.h"
|
| #include "ash/common/metrics/user_metrics_action.h"
|
| #include "ash/common/wm/default_window_resizer.h"
|
| #include "ash/common/wm/dock/docked_window_layout_manager.h"
|
| @@ -885,6 +886,7 @@ void WorkspaceWindowResizer::UpdateSnapPhantomWindow(const gfx::Point& location,
|
| ? DOCKED_ALIGNMENT_LEFT
|
| : DOCKED_ALIGNMENT_RIGHT;
|
| const bool can_dock =
|
| + ash::switches::DockedWindowsEnabled() &&
|
| dock_layout_->CanDockWindow(GetTarget(), desired_alignment) &&
|
| dock_layout_->GetAlignmentOfWindow(GetTarget()) != DOCKED_ALIGNMENT_NONE;
|
| if (!can_dock) {
|
|
|