Not for review.

ui/gfx/ozone/dri/dri_surface_factory.h

Index: ui/gfx/ozone/dri/dri_surface_factory.h
diff --git a/ui/gfx/ozone/dri/dri_surface_factory.h b/ui/gfx/ozone/dri/dri_surface_factory.h
index 616e989e910edebf7e7bfd49b7a8a57074825c0b..9eaf7af12900478af116bf00ae56d6db841ba17b 100644
--- a/ui/gfx/ozone/dri/dri_surface_factory.h
+++ b/ui/gfx/ozone/dri/dri_surface_factory.h
@@ -13,6 +13,7 @@ namespace gfx {
 class DriSurface;
 class DriWrapper;
 class HardwareDisplayController;
+class ScanoutSurface;
 
 // SurfaceFactoryOzone implementation on top of DRM/KMS using dumb buffers.
 // This implementation is used in conjunction with the software rendering
@@ -44,12 +45,22 @@ class GFX_EXPORT DriSurfaceFactory : public SurfaceFactoryOzone {
   virtual gfx::VSyncProvider* GetVSyncProvider(
       gfx::AcceleratedWidget w) OVERRIDE;
 
+ protected:
+  scoped_ptr<DriWrapper> drm_;
+
+  HardwareState state_;
+
+  // Active output.
+  scoped_ptr<HardwareDisplayController> controller_;
+
  private:
-  virtual DriSurface* CreateSurface(
+  virtual ScanoutSurface* CreateSurface(
     HardwareDisplayController* controller);
 
   virtual DriWrapper* CreateWrapper();
 
+  virtual gfx::AcceleratedWidget GetNativeWidget(ScanoutSurface* surface);
+
   virtual bool InitializeControllerForPrimaryDisplay(
     DriWrapper* drm,
     HardwareDisplayController* controller);
@@ -60,13 +71,6 @@ class GFX_EXPORT DriSurfaceFactory : public SurfaceFactoryOzone {
   // pending frame.
   virtual void WaitForPageFlipEvent(int fd);
 
-  scoped_ptr<DriWrapper> drm_;
-
-  HardwareState state_;
-
-  // Active output.
-  scoped_ptr<HardwareDisplayController> controller_;
-
   DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactory);
 };