diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 18:14:32 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 18:14:32 +0000 |
| commit | 9e591cb392ccd0b5fbb0fd95fde5c28783a2727e (patch) | |
| tree | 39c85ed28a66d3bd2fe0829867a190faf7733805 /views/view.cc | |
| parent | 1f9c338425b8472236efbac7f9cef3ab9da84f24 (diff) | |
| download | chromium_src-9e591cb392ccd0b5fbb0fd95fde5c28783a2727e.zip chromium_src-9e591cb392ccd0b5fbb0fd95fde5c28783a2727e.tar.gz chromium_src-9e591cb392ccd0b5fbb0fd95fde5c28783a2727e.tar.bz2 | |
Aura: Combine cursor support for Linux and Windows
+ Change gfx::NativeCursor to an int id on Aura.
+ Fix several cursor-related TODOs in GetCursor() methods.
+ Move X11 cursor cache into x11_util
+ Set platform-specific cursors in aura::DesktopHostWin and DesktopHostLinux
BUG=99871
TEST=manual
Review URL: http://codereview.chromium.org/8256001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view.cc')
| -rw-r--r-- | views/view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/view.cc b/views/view.cc index fc1f938..925a40f 100644 --- a/views/view.cc +++ b/views/view.cc @@ -727,7 +727,7 @@ View* View::GetEventHandlerForPoint(const gfx::Point& point) { } gfx::NativeCursor View::GetCursor(const MouseEvent& event) { -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW); return arrow; #else |