Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Ash non-native cursor should fall back to default pointer cursor for …
Browse files Browse the repository at this point in the history
…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]

[email protected]
NOTRY=true
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1081513003

Cr-Commit-Position: refs/heads/master@{#324701}
(cherry picked from commit c86ec52)

Review URL: https://codereview.chromium.org/1073413002

Cr-Commit-Position: refs/branch-heads/2357@{#49}
Cr-Branched-From: 59d4494-refs/heads/master@{#323860}
  • Loading branch information
hshi-chromium authored and Commit bot committed Apr 11, 2015
1 parent cec610f commit 090ed83
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ash/wm/ash_native_cursor_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down

0 comments on commit 090ed83

Please sign in to comment.