Chromium Code Reviews| Index: ui/aura/root_window_host_linux.cc |
| diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc |
| index 57f6394bfef26de22d21c9eb358a00656ce8303b..02d75bf08787eaf0db3b981c4de628b2382a8ba1 100644 |
| --- a/ui/aura/root_window_host_linux.cc |
| +++ b/ui/aura/root_window_host_linux.cc |
| @@ -152,9 +152,11 @@ int CursorShapeFromNative(gfx::NativeCursor native_cursor) { |
| case aura::kCursorZoomOut: |
| case aura::kCursorGrab: |
| case aura::kCursorGrabbing: |
| - case aura::kCursorCustom: |
| // TODO(jamescook): Need cursors for these. crbug.com/111650 |
| return XC_left_ptr; |
| + case aura::kCursorCustom: |
| + NOTREACHED(); |
|
sadrul
2012/02/24 17:38:19
Too heavy-handed?
Daniel Erat
2012/02/24 18:05:47
No, this seems reasonable to me.
|
| + return XC_left_ptr; |
| } |
| NOTREACHED(); |
| return XC_left_ptr; |
| @@ -550,6 +552,11 @@ void RootWindowHostLinux::SetCursor(gfx::NativeCursor cursor) { |
| SetCursorInternal(cursor); |
| } |
| +void RootWindowHostLinux::SetCustomCursor(const gfx::PlatformCursor& cursor) { |
| + if (cursor_shown_) |
| + XDefineCursor(xdisplay_, xwindow_, cursor); |
| +} |
| + |
| void RootWindowHostLinux::ShowCursor(bool show) { |
| if (show == cursor_shown_) |
| return; |