| Index: ui/gfx/native_widget_types.h
|
| diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
|
| index 2c3e1968a4339b5553b05f9cb177c20a5817d167..f79670d95b15a4d1e6fa2c93a9c33aa6943c8915 100644
|
| --- a/ui/gfx/native_widget_types.h
|
| +++ b/ui/gfx/native_widget_types.h
|
| @@ -98,14 +98,7 @@ typedef struct _PangoFontDescription PangoFontDescription;
|
| typedef struct _cairo cairo_t;
|
| #endif
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| -typedef struct _GdkCursor GdkCursor;
|
| -typedef union _GdkEvent GdkEvent;
|
| -typedef struct _GdkPixbuf GdkPixbuf;
|
| -typedef struct _GdkRegion GdkRegion;
|
| -typedef struct _GtkWidget GtkWidget;
|
| -typedef struct _GtkWindow GtkWindow;
|
| -#elif defined(OS_ANDROID)
|
| +#if defined(OS_ANDROID)
|
| struct ANativeWindow;
|
| namespace ui {
|
| class WindowAndroid;
|
| @@ -132,12 +125,6 @@ typedef NSCursor* NativeCursor;
|
| typedef NSView* NativeView;
|
| typedef NSWindow* NativeWindow;
|
| typedef NSEvent* NativeEvent;
|
| -#elif defined(TOOLKIT_GTK)
|
| -typedef GdkCursor* NativeCursor;
|
| -typedef GtkWidget* NativeView;
|
| -typedef GtkWindow* NativeWindow;
|
| -typedef GdkRegion* NativeRegion;
|
| -typedef GdkEvent* NativeEvent;
|
| #elif defined(OS_ANDROID)
|
| typedef void* NativeCursor;
|
| typedef ui::ViewAndroid* NativeView;
|
| @@ -160,11 +147,6 @@ typedef NSFont* NativeFont;
|
| typedef NSTextField* NativeEditView;
|
| typedef CGContext* NativeDrawingContext;
|
| typedef void* NativeViewAccessible;
|
| -#elif defined(TOOLKIT_GTK)
|
| -typedef PangoFontDescription* NativeFont;
|
| -typedef GtkWidget* NativeEditView;
|
| -typedef cairo_t* NativeDrawingContext;
|
| -typedef void* NativeViewAccessible;
|
| #elif defined(USE_CAIRO)
|
| typedef PangoFontDescription* NativeFont;
|
| typedef void* NativeEditView;
|
| @@ -188,8 +170,6 @@ const gfx::NativeCursor kNullCursor = static_cast<gfx::NativeCursor>(NULL);
|
| typedef UIImage NativeImageType;
|
| #elif defined(OS_MACOSX)
|
| typedef NSImage NativeImageType;
|
| -#elif defined(TOOLKIT_GTK)
|
| -typedef GdkPixbuf NativeImageType;
|
| #else
|
| typedef SkBitmap NativeImageType;
|
| #endif
|
|
|