| 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);
|
| }
|
|
|
|
|