[Ozone-GBM] Pumb DriWindowDelegate throughout the platform

ui/ozone/platform/dri/dri_surface_factory.h

Index: ui/ozone/platform/dri/dri_surface_factory.h
diff --git a/ui/ozone/platform/dri/dri_surface_factory.h b/ui/ozone/platform/dri/dri_surface_factory.h
index 83ce8cf6039c104c98a8177c49d3c15f7ffb0d7f..5d2bc3c369dc417554082401298c36af4c08b0d7 100644
--- a/ui/ozone/platform/dri/dri_surface_factory.h
+++ b/ui/ozone/platform/dri/dri_surface_factory.h
@@ -15,6 +15,7 @@
 namespace ui {
 
 class DriBuffer;
+class DriWindowManager;
 class DriWrapper;
 class ScreenManager;
 class SurfaceOzoneCanvas;
@@ -22,12 +23,14 @@ class SurfaceOzoneCanvas;
 // SurfaceFactoryOzone implementation on top of DRM/KMS using dumb buffers.
 // This implementation is used in conjunction with the software rendering
 // path.
-class DriSurfaceFactory : public ui::SurfaceFactoryOzone,
+class DriSurfaceFactory : public SurfaceFactoryOzone,
                           public HardwareCursorDelegate {
  public:
   static const gfx::AcceleratedWidget kDefaultWidgetHandle;
 
-  DriSurfaceFactory(DriWrapper* drm, ScreenManager* screen_manager);
+  DriSurfaceFactory(DriWrapper* drm,
+                    ScreenManager* screen_manager,
+                    DriWindowManager* window_manager);
   virtual ~DriSurfaceFactory();
 
   // Describes the state of the hardware after initialization.
@@ -38,23 +41,18 @@ class DriSurfaceFactory : public ui::SurfaceFactoryOzone,
   };
 
   // Open the display device.
-  virtual HardwareState InitializeHardware();
+  HardwareState InitializeHardware();
 
   // Close the display device.
-  virtual void ShutdownHardware();
+  void ShutdownHardware();
 
-  virtual scoped_ptr<ui::SurfaceOzoneCanvas> CreateCanvasForWidget(
-      gfx::AcceleratedWidget w) OVERRIDE;
+  // SurfaceFactoryOzone:
+  virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
+      gfx::AcceleratedWidget widget) OVERRIDE;
   virtual bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE;
 
-  // Create a new window/surface/widget identifier.
-  gfx::AcceleratedWidget GetAcceleratedWidget();
-
-  // Determine dimensions of a widget.
-  gfx::Size GetWidgetSize(gfx::AcceleratedWidget w);
-
   // HardwareCursorDelegate:
   virtual void SetHardwareCursor(gfx::AcceleratedWidget window,
                                  const SkBitmap& image,
@@ -68,11 +66,9 @@ class DriSurfaceFactory : public ui::SurfaceFactoryOzone,
 
   DriWrapper* drm_;  // Not owned.
   ScreenManager* screen_manager_;  // Not owned.
+  DriWindowManager* window_manager_;  // Not owned.
   HardwareState state_;
 
-  // Active outputs.
-  int allocated_widgets_;
-
   scoped_refptr<DriBuffer> cursor_buffers_[2];
   int cursor_frontbuffer_;