aura: Make 'ui' buildable without gtk.

ui/gfx/native_widget_types.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "ui/base/ui_export.h"
@@ skipping 42 matching lines @@
 @class NSView;
 @class NSWindow;
 @class NSTextField;
 #else
 class NSFont;
 class NSImage;
 class NSView;
 class NSWindow;
 class NSTextField;
 #endif  // __OBJC__
-#elif defined(USE_WAYLAND)
+#elif defined(OS_POSIX)
 typedef struct _PangoFontDescription PangoFontDescription;
 typedef struct _cairo cairo_t;
+#endif
+
+#if defined(USE_WAYLAND)
 typedef struct _GdkPixbuf GdkPixbuf;
 struct wl_egl_window;
 
 namespace ui {
 class WaylandWindow;
 class WaylandCursor;
 }
 
 typedef struct _GdkRegion GdkRegion;
 #elif defined(TOOLKIT_USES_GTK)
-typedef struct _PangoFontDescription PangoFontDescription;
 typedef struct _GdkCursor GdkCursor;
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GdkRegion GdkRegion;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
-typedef struct _cairo cairo_t;
 #elif defined(OS_ANDROID)
 class ChromeView;
 #endif
 class SkBitmap;
 
 namespace gfx {
 
 #if defined(USE_AURA)
 typedef aura::Window* NativeView;
 typedef aura::Window* NativeWindow;
@@ skipping 29 matching lines @@
 #elif defined(USE_WAYLAND)
 typedef PangoFontDescription* NativeFont;
 typedef void* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef void* NativeCursor;
 typedef void* NativeMenu;
 // TODO(dnicoara) This should be replaced with a cairo region or maybe
 // a Wayland specific region
 typedef GdkRegion* NativeRegion;
 typedef void* NativeViewAccessible;
-#elif defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
 typedef PangoFontDescription* NativeFont;
 typedef GtkWidget* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef GdkCursor* NativeCursor;
 typedef GtkWidget* NativeMenu;
 typedef GdkRegion* NativeRegion;
 typedef void* NativeViewAccessible;
+#elif defined(USE_AURA)
+typedef PangoFontDescription* NativeFont;
+typedef void* NativeEditView;
+typedef cairo_t* NativeDrawingContext;
+typedef void* NativeCursor;
+typedef void* NativeMenu;
+typedef void* NativeRegion;
+typedef void* NativeViewAccessible;
 #elif defined(OS_ANDROID)
 typedef void* NativeFont;
 typedef ChromeView* NativeView;
 typedef ChromeView* NativeWindow;
 typedef void* NativeEditView;
 typedef void* NativeDrawingContext;
 typedef void* NativeCursor;
 typedef void* NativeMenu;
+typedef void* NativeRegion;
 typedef void* NativeViewAccessible;
 #endif
 
 #if defined(OS_MACOSX)
 typedef NSImage NativeImageType;
 #elif defined(TOOLKIT_GTK)
 typedef GdkPixbuf NativeImageType;
 #else
 typedef SkBitmap NativeImageType;
 #endif
@@ skipping 68 matching lines @@
 typedef unsigned long AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #else
 typedef void* AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = NULL;
 #endif
 
 }  // namespace gfx
 
 #endif  // UI_GFX_NATIVE_WIDGET_TYPES_H_