| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 typedef struct _PangoFontDescription PangoFontDescription; | 69 typedef struct _PangoFontDescription PangoFontDescription; |
| 70 typedef struct _cairo cairo_t; | 70 typedef struct _cairo cairo_t; |
| 71 #endif | 71 #endif |
| 72 | 72 |
| 73 #if defined(USE_WAYLAND) | 73 #if defined(USE_WAYLAND) |
| 74 typedef struct _GdkPixbuf GdkPixbuf; | 74 typedef struct _GdkPixbuf GdkPixbuf; |
| 75 struct wl_egl_window; | 75 struct wl_egl_window; |
| 76 | 76 |
| 77 namespace ui { | 77 namespace ui { |
| 78 class WaylandWindow; | 78 class WaylandWindow; |
| 79 class WaylandCursor; | |
| 80 } | 79 } |
| 81 | 80 |
| 82 typedef struct _GdkRegion GdkRegion; | 81 typedef struct _GdkRegion GdkRegion; |
| 83 #elif defined(TOOLKIT_USES_GTK) | 82 #elif defined(TOOLKIT_USES_GTK) |
| 84 typedef struct _GdkCursor GdkCursor; | 83 typedef struct _GdkCursor GdkCursor; |
| 85 typedef union _GdkEvent GdkEvent; | 84 typedef union _GdkEvent GdkEvent; |
| 86 typedef struct _GdkPixbuf GdkPixbuf; | 85 typedef struct _GdkPixbuf GdkPixbuf; |
| 87 typedef struct _GdkRegion GdkRegion; | 86 typedef struct _GdkRegion GdkRegion; |
| 88 typedef struct _GtkWidget GtkWidget; | 87 typedef struct _GtkWidget GtkWidget; |
| 89 typedef struct _GtkWindow GtkWindow; | 88 typedef struct _GtkWindow GtkWindow; |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 typedef unsigned long AcceleratedWidget; | 252 typedef unsigned long AcceleratedWidget; |
| 254 const AcceleratedWidget kNullAcceleratedWidget = 0; | 253 const AcceleratedWidget kNullAcceleratedWidget = 0; |
| 255 #else | 254 #else |
| 256 typedef void* AcceleratedWidget; | 255 typedef void* AcceleratedWidget; |
| 257 const AcceleratedWidget kNullAcceleratedWidget = NULL; | 256 const AcceleratedWidget kNullAcceleratedWidget = NULL; |
| 258 #endif | 257 #endif |
| 259 | 258 |
| 260 } // namespace gfx | 259 } // namespace gfx |
| 261 | 260 |
| 262 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ | 261 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ |
| OLD | NEW |