| 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 5912280b3491ebbf4f79dff06f99bef7f03ae5fd..78f109bb4d52b32b61486e638a0e5d6414a40f41 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer.cc
|
| +++ b/ash/wm/workspace/workspace_window_resizer.cc
|
| @@ -9,11 +9,11 @@
|
|
|
| #include "ash/screen_ash.h"
|
| #include "ash/shell.h"
|
| +#include "ash/wm/cursor_manager.h"
|
| #include "ash/wm/property_util.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ash/wm/workspace/phantom_window_controller.h"
|
| #include "ash/wm/workspace/snap_sizer.h"
|
| -#include "ui/aura/cursor_manager.h"
|
| #include "ui/aura/env.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_delegate.h"
|
| @@ -46,7 +46,7 @@ const int WorkspaceWindowResizer::kMinOnscreenSize = 20;
|
| const int WorkspaceWindowResizer::kMinOnscreenHeight = 32;
|
|
|
| WorkspaceWindowResizer::~WorkspaceWindowResizer() {
|
| - aura::Env::GetInstance()->cursor_manager()->UnlockCursor();
|
| + ash::Shell::GetInstance()->cursor_manager()->UnlockCursor();
|
| }
|
|
|
| // static
|
| @@ -164,7 +164,7 @@ WorkspaceWindowResizer::WorkspaceWindowResizer(
|
| snap_type_(SNAP_NONE),
|
| num_mouse_moves_since_bounds_change_(0) {
|
| DCHECK(details_.is_resizable);
|
| - aura::Env::GetInstance()->cursor_manager()->LockCursor();
|
| + ash::Shell::GetInstance()->cursor_manager()->LockCursor();
|
|
|
| // Only support attaching to the right/bottom.
|
| DCHECK(attached_windows_.empty() ||
|
|
|