Make ShellPortMash also dispatch to cursor_manager in mus mode.

ash/wm/native_cursor_manager_ash_mus.cc

 // Copyright 2017 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/wm/native_cursor_manager_ash_mus.h"
 
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ui/aura/env.h"
+#include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/image_cursors.h"
 #include "ui/base/layout.h"
 #include "ui/wm/core/cursor_manager.h"
 
 #if defined(USE_OZONE)
 #include "ui/base/cursor/ozone/cursor_data_factory_ozone.h"
 #endif
@@ skipping 13 matching lines @@
         << "Can't pass native platform cursors on non-ozone platforms";
     mojo_cursor = ui::CursorData(ui::CursorType::kPointer);
 #endif
   } else {
     mojo_cursor = ui::CursorData(cursor.native_type());
   }
 
   // As the window manager, tell mus to use |mojo_cursor| everywhere. We do
   // this instead of trying to set per-window because otherwise we run into the
   // event targeting issue.
-  ShellPort::Get()->SetGlobalOverrideCursor(mojo_cursor);
+  Shell::window_manager_client()->SetGlobalOverrideCursor(mojo_cursor);
 
   // Make sure the local state is set properly, so that local queries show that
   // we set the cursor.
   for (aura::Window* root : Shell::Get()->GetAllRootWindows())
     root->GetHost()->SetCursor(cursor);
 
   Shell::Get()
       ->window_tree_host_manager()
       ->cursor_window_controller()
       ->SetCursor(cursor);
 }
 
 void NotifyCursorVisibilityChange(bool visible) {
   // Communicate the cursor visibility state to the mus server.
-  if (visible)
-    ShellPort::Get()->ShowCursor();
-  else
-    ShellPort::Get()->HideCursor();
+  Shell::window_manager_client()->SetCursorVisible(visible);
 
   // Communicate the cursor visibility change to our local root window objects.
   aura::Window::Windows root_windows = Shell::Get()->GetAllRootWindows();
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->GetHost()->OnCursorVisibilityChanged(visible);
 
   Shell::Get()
       ->window_tree_host_manager()
       ->cursor_window_controller()
@@ skipping 103 matching lines @@
   }
 
   NotifyCursorVisibilityChange(visible);
 }
 
 void NativeCursorManagerAshMus::SetCursorSize(
     ui::CursorSize cursor_size,
     ::wm::NativeCursorManagerDelegate* delegate) {
   delegate->CommitCursorSize(cursor_size);
 
-  ShellPort::Get()->SetCursorSize(cursor_size);
+  Shell::window_manager_client()->SetCursorSize(cursor_size);
 
   Shell::Get()
       ->window_tree_host_manager()
       ->cursor_window_controller()
       ->SetCursorSize(cursor_size);
 }
 
 void NativeCursorManagerAshMus::SetMouseEventsEnabled(
     bool enabled,
     ::wm::NativeCursorManagerDelegate* delegate) {
   delegate->CommitMouseEventsEnabled(enabled);
 
   if (enabled) {
     aura::Env::GetInstance()->set_last_mouse_location(
         disabled_cursor_location_);
   } else {
     disabled_cursor_location_ = aura::Env::GetInstance()->last_mouse_location();
   }
 
   SetVisibility(delegate->IsCursorVisible(), delegate);
 
   NotifyMouseEventsEnableStateChange(enabled);
 }
 
 }  // namespace ash