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

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

Issue 2784663003: mus: Rename mojom::Cursor to mojom::CursorType. (Closed)
Patch Set: Created 3 years, 9 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/event_dispatcher.h ('k') | services/ui/ws/platform_display.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/event_dispatcher.cc
diff --git a/services/ui/ws/event_dispatcher.cc b/services/ui/ws/event_dispatcher.cc
index e549706f85ba2f4924d737bf8f1c6b08e52fa98b..fd1cc361a7e4bfa87592ae03027856bb3c7c499f 100644
--- a/services/ui/ws/event_dispatcher.cc
+++ b/services/ui/ws/event_dispatcher.cc
@@ -86,18 +86,18 @@ void EventDispatcher::SetMousePointerScreenLocation(
delegate_->OnMouseCursorLocationChanged(screen_location);
}
-ui::mojom::Cursor EventDispatcher::GetCurrentMouseCursor() const {
+ui::mojom::CursorType EventDispatcher::GetCurrentMouseCursor() const {
if (drag_controller_)
return drag_controller_->current_cursor();
if (!mouse_cursor_source_window_)
- return ui::mojom::Cursor::POINTER;
+ return ui::mojom::CursorType::POINTER;
if (mouse_cursor_in_non_client_area_)
return mouse_cursor_source_window_->non_client_cursor();
const ServerWindow* window = GetWindowForMouseCursor();
- return window ? window->cursor() : ui::mojom::Cursor::POINTER;
+ return window ? window->cursor() : ui::mojom::CursorType::POINTER;
}
bool EventDispatcher::SetCaptureWindow(ServerWindow* window,
« no previous file with comments | « services/ui/ws/event_dispatcher.h ('k') | services/ui/ws/platform_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698