[wip] ozonex: X11 backend for ozone.

ui/gfx/ozone/surface_factory_ozone.h

Index: ui/gfx/ozone/surface_factory_ozone.h
diff --git a/ui/gfx/ozone/surface_factory_ozone.h b/ui/gfx/ozone/surface_factory_ozone.h
index b7eb83b3e356dd76cd7aff2571ecae7b0e462031..6bb8eb802cc7cfa47b858cf9f6e8a34a731b035f 100644
--- a/ui/gfx/ozone/surface_factory_ozone.h
+++ b/ui/gfx/ozone/surface_factory_ozone.h
@@ -14,6 +14,7 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/gfx/rect.h"
+#include "ui/platform_window/platform_window_delegate.h"
 
 class SkBitmap;
 class SkCanvas;
@@ -100,7 +101,7 @@ class GFX_EXPORT SurfaceFactoryOzone {
   // Obtains an AcceleratedWidget backed by a native Linux framebuffer.
   // The  returned AcceleratedWidget is an opaque token that must realized
   // before it can be used to create a GL surface.
-  virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
+  virtual intptr_t CreatePlatformWindow(ui::PlatformWindowDelegate*) = 0;
 
   // Create SurfaceOzoneEGL for the specified gfx::AcceleratedWidget.
   //
@@ -108,14 +109,13 @@ class GFX_EXPORT SurfaceFactoryOzone {
   // platform must support creation of SurfaceOzoneEGL from the GPU process
   // using only the handle contained in gfx::AcceleratedWidget.
   virtual scoped_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
-        gfx::AcceleratedWidget widget);
+      intptr_t widget);
 
   // Create SurfaceOzoneCanvas for the specified gfx::AcceleratedWidget.
   //
   // Note: The platform must support creation of SurfaceOzoneCanvas from the
   // Browser Process using only the handle contained in gfx::AcceleratedWidget.
-  virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
-        gfx::AcceleratedWidget widget);
+  virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(intptr_t widget);
 
   // Sets up GL bindings for the native surface. Takes two callback parameters
   // that allow Ozone to register the GL bindings.
@@ -131,8 +131,7 @@ class GFX_EXPORT SurfaceFactoryOzone {
   virtual const int32* GetEGLSurfaceProperties(const int32* desired_list);
 
   // Get the hal struct to check for overlay support.
-  virtual gfx::OverlayCandidatesOzone* GetOverlayCandidates(
-      gfx::AcceleratedWidget w);
+  virtual gfx::OverlayCandidatesOzone* GetOverlayCandidates(intptr_t w);
 
   // Sets the overlay plane to switch to at the next page flip.
   // |plane_z_order| specifies the stacking order of the plane relative to the
@@ -143,7 +142,7 @@ class GFX_EXPORT SurfaceFactoryOzone {
   // |display_bounds| specify where it is supposed to be on the screen.
   // |crop_rect| specifies the region within the buffer to be placed inside
   // |display_bounds|.
-  virtual void ScheduleOverlayPlane(gfx::AcceleratedWidget w,
+  virtual void ScheduleOverlayPlane(intptr_t w,
                                     int plane_z_order,
                                     gfx::OverlayTransform plane_transform,
                                     gfx::NativeBufferOzone buffer,