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

Unified Diff: components/exo/wm_helper_ash.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: components/exo/wm_helper_ash.cc
diff --git a/components/exo/wm_helper_ash.cc b/components/exo/wm_helper_ash.cc
index 70764d0cbe512a1c7c6d62a8fe0fe2031a6dfbdd..eee095e8a401ae700d85930df92102b7525fa6c8 100644
--- a/components/exo/wm_helper_ash.cc
+++ b/components/exo/wm_helper_ash.cc
@@ -70,10 +70,10 @@ aura::Window* WMHelperAsh::GetFocusedWindow() const {
return focus_client->GetFocusedWindow();
}
-ui::CursorSetType WMHelperAsh::GetCursorSet() const {
+ui::CursorSet WMHelperAsh::GetCursorSet() const {
// TODO(crbug.com/631103): Mushrome doesn't have a cursor manager yet.
if (ash::Shell::GetAshConfig() == ash::Config::MUS)
- return ui::CURSOR_SET_NORMAL;
+ return ui::CursorSet::kNormal;
return ash::Shell::Get()->cursor_manager()->GetCursorSet();
}
@@ -128,7 +128,7 @@ void WMHelperAsh::OnCursorVisibilityChanged(bool is_visible) {
NotifyCursorVisibilityChanged(is_visible);
}
-void WMHelperAsh::OnCursorSetChanged(ui::CursorSetType cursor_set) {
+void WMHelperAsh::OnCursorSetChanged(ui::CursorSet cursor_set) {
NotifyCursorSetChanged(cursor_set);
}

Powered by Google App Engine
This is Rietveld 408576698