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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_ 5 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_ 6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "ui/base/ui_export.h" 10 #include "ui/base/ui_export.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 } 44 }
45 #endif // defined(USE_AURA) 45 #endif // defined(USE_AURA)
46 46
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
48 #include <windows.h> // NOLINT 48 #include <windows.h> // NOLINT
49 typedef struct HFONT__* HFONT; 49 typedef struct HFONT__* HFONT;
50 struct IAccessible; 50 struct IAccessible;
51 #elif defined(OS_MACOSX) 51 #elif defined(OS_MACOSX)
52 struct CGContext; 52 struct CGContext;
53 #ifdef __OBJC__ 53 #ifdef __OBJC__
54 @class NSCursor;
54 @class NSEvent; 55 @class NSEvent;
55 @class NSFont; 56 @class NSFont;
56 @class NSImage; 57 @class NSImage;
57 @class NSView; 58 @class NSView;
58 @class NSWindow; 59 @class NSWindow;
59 @class NSTextField; 60 @class NSTextField;
60 #else 61 #else
62 class NSCursor;
61 class NSEvent; 63 class NSEvent;
62 class NSFont; 64 class NSFont;
63 class NSImage; 65 class NSImage;
64 class NSView; 66 class NSView;
65 class NSWindow; 67 class NSWindow;
66 class NSTextField; 68 class NSTextField;
67 #endif // __OBJC__ 69 #endif // __OBJC__
68 #elif defined(OS_POSIX) 70 #elif defined(OS_POSIX)
69 typedef struct _PangoFontDescription PangoFontDescription; 71 typedef struct _PangoFontDescription PangoFontDescription;
70 typedef struct _cairo cairo_t; 72 typedef struct _cairo cairo_t;
(...skipping 29 matching lines...) Expand all
100 typedef aura::Window* NativeWindow; 102 typedef aura::Window* NativeWindow;
101 typedef SkRegion* NativeRegion; 103 typedef SkRegion* NativeRegion;
102 typedef aura::Event* NativeEvent; 104 typedef aura::Event* NativeEvent;
103 #elif defined(OS_WIN) 105 #elif defined(OS_WIN)
104 typedef HCURSOR NativeCursor; 106 typedef HCURSOR NativeCursor;
105 typedef HWND NativeView; 107 typedef HWND NativeView;
106 typedef HWND NativeWindow; 108 typedef HWND NativeWindow;
107 typedef HRGN NativeRegion; 109 typedef HRGN NativeRegion;
108 typedef MSG NativeEvent; 110 typedef MSG NativeEvent;
109 #elif defined(OS_MACOSX) 111 #elif defined(OS_MACOSX)
110 typedef void* NativeCursor; 112 typedef NSCursor* NativeCursor;
111 typedef NSView* NativeView; 113 typedef NSView* NativeView;
112 typedef NSWindow* NativeWindow; 114 typedef NSWindow* NativeWindow;
113 typedef NSEvent* NativeEvent; 115 typedef NSEvent* NativeEvent;
114 #elif defined(USE_WAYLAND) 116 #elif defined(USE_WAYLAND)
115 typedef void* NativeCursor; 117 typedef void* NativeCursor;
116 typedef ui::WaylandWindow* NativeView; 118 typedef ui::WaylandWindow* NativeView;
117 typedef ui::WaylandWindow* NativeWindow; 119 typedef ui::WaylandWindow* NativeWindow;
118 // TODO(dnicoara) This should be replaced with a cairo region or maybe 120 // TODO(dnicoara) This should be replaced with a cairo region or maybe
119 // a Wayland specific region 121 // a Wayland specific region
120 typedef GdkRegion* NativeRegion; 122 typedef GdkRegion* NativeRegion;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 typedef NSView* AcceleratedWidget; 268 typedef NSView* AcceleratedWidget;
267 const AcceleratedWidget kNullAcceleratedWidget = 0; 269 const AcceleratedWidget kNullAcceleratedWidget = 0;
268 #else 270 #else
269 typedef void* AcceleratedWidget; 271 typedef void* AcceleratedWidget;
270 const AcceleratedWidget kNullAcceleratedWidget = NULL; 272 const AcceleratedWidget kNullAcceleratedWidget = NULL;
271 #endif 273 #endif
272 274
273 } // namespace gfx 275 } // namespace gfx
274 276
275 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ 277 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_
OLDNEW
« 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