Add Aura support to views:

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 60 matching lines @@
 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;
 #endif
 class SkBitmap;
 
+#if defined(USE_AURA)

[sky, 2011/08/24 22:29:34]

Before class SkBitmap?

+#include "aura/window.h"
+#endif
+
 namespace gfx {
 
+#if defined(USE_AURA)
+typedef aura::Window* NativeView;
+typedef aura::Window* NativeWindow;
+#elif defined(OS_WIN)
+typedef HWND NativeView;
+typedef HWND NativeWindow;
+#elif defined(OS_MACOSX)
+typedef NSView* NativeView;
+typedef NSWindow* NativeWindow;
+#elif defined(USE_WAYLAND)
+typedef ui::WaylandWindow* NativeView;
+typedef ui::WaylandWindow* NativeWindow;
+#elif defined(USE_X11)
+typedef GtkWidget* NativeView;
+typedef GtkWindow* NativeWindow;
+#endif
+
 #if defined(OS_WIN)
 typedef HFONT NativeFont;
-typedef HWND NativeView;
-typedef HWND NativeWindow;
 typedef HWND NativeEditView;
 typedef HDC NativeDrawingContext;
 typedef HCURSOR NativeCursor;
 typedef HMENU NativeMenu;
 typedef HRGN NativeRegion;
 typedef IAccessible* NativeViewAccessible;
 #elif defined(OS_MACOSX)
 typedef NSFont* NativeFont;
-typedef NSView* NativeView;
-typedef NSWindow* NativeWindow;
 typedef NSTextField* NativeEditView;
 typedef CGContext* NativeDrawingContext;
 typedef void* NativeCursor;
 typedef void* NativeMenu;
 typedef void* NativeViewAccessible;
 #elif defined(USE_WAYLAND)
 typedef PangoFontDescription* NativeFont;
-typedef ui::WaylandWindow* NativeView;
-typedef ui::WaylandWindow* NativeWindow;
 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)
 typedef PangoFontDescription* NativeFont;
-typedef GtkWidget* NativeView;
-typedef GtkWindow* NativeWindow;
 typedef GtkWidget* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef GdkCursor* NativeCursor;
 typedef GtkWidget* NativeMenu;
 typedef GdkRegion* NativeRegion;
 typedef void* NativeViewAccessible;
 #endif
 
 #if defined(OS_MACOSX)
 typedef NSImage NativeImageType;
 #elif defined(TOOLKIT_GTK)
 typedef GdkPixbuf NativeImageType;
 #else
 typedef SkBitmap NativeImageType;
 #endif
 typedef NativeImageType* NativeImage;
 
 // Note: for test_shell we're packing a pointer into the NativeViewId. So, if
 // you make it a type which is smaller than a pointer, you have to fix
 // test_shell.
 //
 // See comment at the top of the file for usage.
 typedef intptr_t NativeViewId;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 // Convert a NativeViewId to a NativeView.
 //
 // On Windows, we pass an HWND into the renderer. As stated above, the renderer
 // should not be performing operations on the view.
 static inline NativeView NativeViewFromId(NativeViewId id) {
   return reinterpret_cast<NativeView>(id);
 }
 #define NativeViewFromIdInBrowser(x) NativeViewFromId(x)
-#elif defined(OS_POSIX)
+#elif defined(OS_POSIX) || defined(USE_AURA)
 // On Mac and Linux, a NativeView is a pointer to an object, and is useless

[sky, 2011/08/24 22:29:34]

Update comment.

 // outside the process in which it was created. NativeViewFromId should only be
 // used inside the appropriate platform ifdef outside of the browser.
 // (NativeViewFromIdInBrowser can be used everywhere in the browser.) If your
 // cross-platform design involves a call to NativeViewFromId from outside the
 // browser it will never work on Mac or Linux and is fundamentally broken.
 
 // Please do not call this from outside the browser. It won't work; the name
 // should give you a subtle hint.
 static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) {
   return reinterpret_cast<NativeView>(id);
@@ skipping 38 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_