Make ShellPortMash also dispatch to cursor_manager in mus mode.

ash/mus/bridge/shell_port_mash.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/bridge/shell_port_mash.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
@@ skipping 113 matching lines @@
   return window_manager_->config();
 }
 
 std::unique_ptr<display::TouchTransformSetter>
 ShellPortMash::CreateTouchTransformDelegate() {
   return base::MakeUnique<TouchTransformSetterMus>(
       window_manager_->connector());
 }
 
 void ShellPortMash::LockCursor() {
-  window_manager_->window_manager_client()->LockCursor();
+  // When we are running in mus, we need to keep track of state not just in the
+  // window server, but also locally in ash because ash treats the cursor
+  // manager as the canonical state for now. NativeCursorManagerAsh will keep
+  // this state, while also forwarding it to the window manager for us.
+  if (mus_state_)

[James Cook, 2017/06/29 19:43:24]

nit: I think these if()s would be clearer if they called GetAshConfig() to check
the mode.

[Elliot Glaysher, 2017/06/29 21:39:36]

Done.

+    Shell::Get()->cursor_manager()->LockCursor();
+  else
+    window_manager_->window_manager_client()->LockCursor();
 }
 
 void ShellPortMash::UnlockCursor() {
-  window_manager_->window_manager_client()->UnlockCursor();
+  if (mus_state_)
+    Shell::Get()->cursor_manager()->UnlockCursor();
+  else
+    window_manager_->window_manager_client()->UnlockCursor();
 }
 
 void ShellPortMash::ShowCursor() {
-  window_manager_->window_manager_client()->SetCursorVisible(true);
+  if (mus_state_)
+    Shell::Get()->cursor_manager()->ShowCursor();
+  else
+    window_manager_->window_manager_client()->SetCursorVisible(true);
 }
 
 void ShellPortMash::HideCursor() {
-  window_manager_->window_manager_client()->SetCursorVisible(false);
+  if (mus_state_)
+    Shell::Get()->cursor_manager()->HideCursor();
+  else
+    window_manager_->window_manager_client()->SetCursorVisible(false);
 }
 
 void ShellPortMash::SetCursorSize(ui::CursorSize cursor_size) {
-  window_manager_->window_manager_client()->SetCursorSize(cursor_size);
+  if (mus_state_)
+    Shell::Get()->cursor_manager()->SetCursorSize(cursor_size);
+  else
+    window_manager_->window_manager_client()->SetCursorSize(cursor_size);
 }
 
 void ShellPortMash::SetGlobalOverrideCursor(
     base::Optional<ui::CursorData> cursor) {
+  DCHECK(mash_state_);
   window_manager_->window_manager_client()->SetGlobalOverrideCursor(
       std::move(cursor));
 }
 
 bool ShellPortMash::IsMouseEventsEnabled() {
   // TODO: http://crbug.com/637853
   NOTIMPLEMENTED();
   return true;
 }
 
@@ skipping 207 matching lines @@
   mash_state_->accelerator_controller_registrar =
       base ::MakeUnique<AcceleratorControllerRegistrar>(
           window_manager_, accelerator_namespace_id);
   return base::MakeUnique<AcceleratorController>(
       mash_state_->accelerator_controller_delegate.get(),
       mash_state_->accelerator_controller_registrar.get());
 }
 
 }  // namespace mus
 }  // namespace ash