| Index: ash/wm/ash_native_cursor_manager.cc
|
| diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc
|
| index 1bbafbf56c16698a1c6adaa806c1cc6005c82772..45a3ef82f59b4d8ffeabbd7e72ab466b331897da 100644
|
| --- a/ash/wm/ash_native_cursor_manager.cc
|
| +++ b/ash/wm/ash_native_cursor_manager.cc
|
| @@ -93,12 +93,12 @@ void AshNativeCursorManager::SetCursor(
|
| if (native_cursor_enabled_) {
|
| image_cursors_->SetPlatformCursor(&cursor);
|
| } else {
|
| - gfx::NativeCursor invisible_cursor(ui::kCursorNone);
|
| + gfx::NativeCursor invisible_cursor(ui::CursorType::kNone);
|
| image_cursors_->SetPlatformCursor(&invisible_cursor);
|
| - if (cursor == ui::kCursorCustom) {
|
| + if (cursor == ui::CursorType::kCustom) {
|
| // Fall back to the default pointer cursor for now. (crbug.com/476078)
|
| // TODO(oshima): support custom cursor.
|
| - cursor = ui::kCursorPointer;
|
| + cursor = ui::CursorType::kPointer;
|
| } else {
|
| cursor.SetPlatformCursor(invisible_cursor.platform());
|
| }
|
| @@ -135,7 +135,7 @@ void AshNativeCursorManager::SetVisibility(
|
| if (visible) {
|
| SetCursor(delegate->GetCursor(), delegate);
|
| } else {
|
| - gfx::NativeCursor invisible_cursor(ui::kCursorNone);
|
| + gfx::NativeCursor invisible_cursor(ui::CursorType::kNone);
|
| image_cursors_->SetPlatformCursor(&invisible_cursor);
|
| SetCursorOnAllRootWindows(invisible_cursor);
|
| }
|
|
|