Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/view.cc

Issue 10939006: Make cursors work on win aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix win build Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/cursor/cursor_loader_win.cc ('k') | ui/views/views.gyp » ('j') | ui/views/widget/desktop_screen_position_client_aura.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.cc
===================================================================
--- ui/views/view.cc (revision 157082)
+++ ui/views/view.cc (working copy)
@@ -765,9 +765,16 @@
}
gfx::NativeCursor View::GetCursor(const ui::MouseEvent& event) {
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
+#if defined(USE_AURA)
+ static ui::Cursor arrow;
+ if (!arrow.platform())
+ arrow.SetPlatformCursor(LoadCursor(NULL, IDC_ARROW));
+ return arrow;
+#else
static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
return arrow;
+#endif
#else
return gfx::kNullCursor;
#endif
« no previous file with comments | « ui/base/cursor/cursor_loader_win.cc ('k') | ui/views/views.gyp » ('j') | ui/views/widget/desktop_screen_position_client_aura.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698