Index: ash/wm/lock_state_controller.cc |
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc |
index 9fb69566d8bf64a871f40935a6c37149b36c28e1..f55f8309955893695804965427677859b17a285a 100644 |
--- a/ash/wm/lock_state_controller.cc |
+++ b/ash/wm/lock_state_controller.cc |
@@ -161,13 +161,9 @@ void LockStateController::RequestShutdown() { |
shutting_down_ = true; |
- Shell* shell = Shell::Get(); |
- // TODO(derat): Remove these null checks once mash instantiates a |
- // CursorManager. |
- if (shell->cursor_manager()) { |
- shell->cursor_manager()->HideCursor(); |
- shell->cursor_manager()->LockCursor(); |
- } |
+ ShellPort* port = ShellPort::Get(); |
+ port->HideCursor(); |
+ port->LockCursor(); |
animator_->StartAnimation( |
SessionStateAnimator::ROOT_CONTAINER, |