Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1739)

Unified Diff: ash/wm/native_cursor_manager_ash_mus.cc

Issue 2949353003: Implement large cursors in Mushrome. (Closed)
Patch Set: Remove old cursor.h includes. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(

Powered by Google App Engine
This is Rietveld 408576698