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

Unified Diff: ui/gfx/native_widget_types.h

Issue 9355017: Merge 122386 - Fix Mac custom cursor color. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1025/src/
Patch Set: Created 8 years, 10 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 | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | webkit/glue/webcursor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/native_widget_types.h
===================================================================
--- ui/gfx/native_widget_types.h (revision 122555)
+++ ui/gfx/native_widget_types.h (working copy)
@@ -51,6 +51,7 @@
#elif defined(OS_MACOSX)
struct CGContext;
#ifdef __OBJC__
+@class NSCursor;
@class NSEvent;
@class NSFont;
@class NSImage;
@@ -58,6 +59,7 @@
@class NSWindow;
@class NSTextField;
#else
+class NSCursor;
class NSEvent;
class NSFont;
class NSImage;
@@ -107,7 +109,7 @@
typedef HRGN NativeRegion;
typedef MSG NativeEvent;
#elif defined(OS_MACOSX)
-typedef void* NativeCursor;
+typedef NSCursor* NativeCursor;
typedef NSView* NativeView;
typedef NSWindow* NativeWindow;
typedef NSEvent* NativeEvent;
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | webkit/glue/webcursor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698