| Index: ash/wm/workspace/workspace_window_resizer.cc
|
| diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
|
| index bd1ef257747d2e1e568c615c36496843f3c44771..5da46ca5aca080038d74ed4bea85eba2ce84eaa8 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer.cc
|
| +++ b/ash/wm/workspace/workspace_window_resizer.cc
|
| @@ -942,7 +942,7 @@ void WorkspaceWindowResizer::UpdateSnapPhantomWindow(const gfx::Point& location,
|
| return;
|
| }
|
| if (!edge_cycler_)
|
| - edge_cycler_.reset(new TwoStepEdgeCycler(location));
|
| + edge_cycler_.reset(new TwoStepEdgeCycler(location, snap_type_));
|
| else
|
| edge_cycler_->OnMove(location);
|
|
|
| @@ -1005,8 +1005,7 @@ void WorkspaceWindowResizer::RestackWindows() {
|
| }
|
| }
|
|
|
| -WorkspaceWindowResizer::SnapType WorkspaceWindowResizer::GetSnapType(
|
| - const gfx::Point& location) const {
|
| +SnapType WorkspaceWindowResizer::GetSnapType(const gfx::Point& location) const {
|
| // TODO: this likely only wants total display area, not the area of a single
|
| // display.
|
| gfx::Rect area(ScreenUtil::GetDisplayWorkAreaBoundsInParent(GetTarget()));
|
|
|