Ash non-native cursor should fall back to default pointer cursor for …

…custom cursor. TODO(oshima): support custom cursor. BUG=476078 TEST=verify that file manager shows the default large pointer cursor when cropping images. [email protected] Review URL: https://codereview.chromium.org/1081513003 Cr-Commit-Position: refs/heads/master@{#324701}
crosswalk-project · Apr 10, 2015 · c86ec52 · c86ec52
1 parent 82aef33
commit c86ec52
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc
@@ -103,7 +103,9 @@ void AshNativeCursorManager::SetCursor(
     gfx::NativeCursor invisible_cursor(ui::kCursorNone);
     image_cursors_->SetPlatformCursor(&invisible_cursor);
     if (cursor == ui::kCursorCustom) {
-      cursor = invisible_cursor;
+      // Fall back to the default pointer cursor for now. (crbug.com/476078)
+      // TODO(oshima): support custom cursor.
+      cursor = ui::kCursorPointer;
     } else {
       cursor.SetPlatformCursor(invisible_cursor.platform());
     }

diff --git a/third_party/libc++/trunk b/third_party/libc++/trunk
diff --git a/third_party/libc++abi/trunk b/third_party/libc++abi/trunk