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

Unified Diff: services/ui/ws/window_manager_state.cc

Issue 2830703003: [views-mus] Support custom cursors. (Closed)
Patch Set: fix cast_shell_linux Created 3 years, 8 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
« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/window_manager_state_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_manager_state.cc
diff --git a/services/ui/ws/window_manager_state.cc b/services/ui/ws/window_manager_state.cc
index 35ff9b97c487463b8cfd6fd9821bf7c93125a573..295eb4dbd82cdeea189d594a7e6b9f7c774b7c0a 100644
--- a/services/ui/ws/window_manager_state.cc
+++ b/services/ui/ws/window_manager_state.cc
@@ -588,10 +588,9 @@ void WindowManagerState::ReleaseNativeCapture() {
}
void WindowManagerState::UpdateNativeCursorFromDispatcher() {
- const ui::mojom::CursorType cursor_id =
- event_dispatcher_.GetCurrentMouseCursor();
+ const ui::CursorData cursor = event_dispatcher_.GetCurrentMouseCursor();
for (Display* display : display_manager()->displays())
- display->UpdateNativeCursor(cursor_id);
+ display->UpdateNativeCursor(cursor);
}
void WindowManagerState::OnCaptureChanged(ServerWindow* new_capture,
« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/window_manager_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698