| Index: ash/wm/native_cursor_manager_ash_mus.cc
|
| diff --git a/ash/wm/native_cursor_manager_ash_mus.cc b/ash/wm/native_cursor_manager_ash_mus.cc
|
| index a53c6b6dbdd937057e0b36a748e49cca9403671c..425d036155b8e81a954692ec95850cc27f977a80 100644
|
| --- a/ash/wm/native_cursor_manager_ash_mus.cc
|
| +++ b/ash/wm/native_cursor_manager_ash_mus.cc
|
| @@ -175,11 +175,16 @@ void NativeCursorManagerAshMus::SetVisibility(
|
| }
|
|
|
| void NativeCursorManagerAshMus::SetCursorSet(
|
| - ui::CursorSetType cursor_set,
|
| + ui::CursorSet cursor_set,
|
| ::wm::NativeCursorManagerDelegate* delegate) {
|
| - // We can't just hand this off to ImageCursors like we do in the classic ash
|
| - // case. We need to collaborate with the mus server to fully implement this.
|
| - NOTIMPLEMENTED();
|
| + delegate->CommitCursorSet(cursor_set);
|
| +
|
| + ShellPort::Get()->SetCursorSet(cursor_set);
|
| +
|
| + Shell::Get()
|
| + ->window_tree_host_manager()
|
| + ->cursor_window_controller()
|
| + ->SetCursorSet(cursor_set);
|
| }
|
|
|
| void NativeCursorManagerAshMus::SetMouseEventsEnabled(
|
|
|