| Index: ash/wm/drag_window_resizer.cc
|
| diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc
|
| index d0f977551f78c0d7c99e0247683d36bb54067c6e..57dd6f4d1bbb61d4be33c833d227eeed757b6659 100644
|
| --- a/ash/wm/drag_window_resizer.cc
|
| +++ b/ash/wm/drag_window_resizer.cc
|
| @@ -4,12 +4,15 @@
|
|
|
| #include "ash/wm/drag_window_resizer.h"
|
|
|
| +#include "ash/ash_switches.h"
|
| #include "ash/display/mouse_cursor_event_filter.h"
|
| #include "ash/screen_ash.h"
|
| #include "ash/shell.h"
|
| #include "ash/wm/coordinate_conversion.h"
|
| +#include "ash/wm/dock/dock_layout_manager.h"
|
| #include "ash/wm/drag_window_controller.h"
|
| #include "ash/wm/property_util.h"
|
| +#include "base/command_line.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/env.h"
|
| #include "ui/aura/root_window.h"
|
| @@ -112,6 +115,11 @@ void DragWindowResizer::CompleteDrag(int event_flags) {
|
| GetTarget()->bounds());
|
| GetTarget()->SetBoundsInScreen(dst_bounds, dst_display);
|
| }
|
| + if ((details_.bounds_change & WindowResizer::kBoundsChange_Repositions) &&
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshEnableDockedWindows)) {
|
| + SetDockEdge(GetTarget(), DockLayoutManager::FindDockEdge(GetTarget()));
|
| + }
|
| }
|
|
|
| void DragWindowResizer::RevertDrag() {
|
|
|