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/controls/link.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/controls/link.cc')
| -rw-r--r-- | views/controls/link.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/views/controls/link.cc b/views/controls/link.cc index 08f2447..4f71741 100644 --- a/views/controls/link.cc +++ b/views/controls/link.cc @@ -23,6 +23,10 @@ #include "ui/gfx/gtk_util.h" #endif +#if defined(USE_AURA) +#include "ui/aura/cursor.h" +#endif + namespace views { const char Link::kViewClassName[] = "views/Link"; @@ -50,14 +54,13 @@ std::string Link::GetClassName() const { gfx::NativeCursor Link::GetCursor(const MouseEvent& event) { if (!IsEnabled()) return gfx::kNullCursor; -#if defined(OS_WIN) +#if defined(USE_AURA) + return aura::kCursorHand; +#elif defined(OS_WIN) static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND); return g_hand_cursor; #elif defined(TOOLKIT_USES_GTK) return gfx::GetCursor(GDK_HAND2); -#else - // TODO(saintlou): - return gfx::kNullCursor; #endif } |