[Ozone-GBM] Pumb DriWindowDelegate throughout the platform

ui/ozone/platform/dri/dri_surface.h

Index: ui/ozone/platform/dri/dri_surface.h
diff --git a/ui/ozone/platform/dri/dri_surface.h b/ui/ozone/platform/dri/dri_surface.h
index e46a531b793177a3583d1bd94663386dfdf3be90..740a31090670e40eb51a1791c6a8c39f503843cc 100644
--- a/ui/ozone/platform/dri/dri_surface.h
+++ b/ui/ozone/platform/dri/dri_surface.h
@@ -5,8 +5,7 @@
 #ifndef UI_OZONE_PLATFORM_DRI_DRI_SURFACE_H_
 #define UI_OZONE_PLATFORM_DRI_DRI_SURFACE_H_
 
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/skia_util.h"
@@ -18,13 +17,13 @@ class SkSurface;
 namespace ui {
 
 class DriBuffer;
+class DriWindowDelegate;
 class DriWrapper;
 class HardwareDisplayController;
 
 class DriSurface : public SurfaceOzoneCanvas {
  public:
-  DriSurface(DriWrapper* dri,
-             const base::WeakPtr<HardwareDisplayController>& controller);
+  DriSurface(DriWindowDelegate* window_delegate, DriWrapper* dri);
   virtual ~DriSurface();
 
   // SurfaceOzoneCanvas:
@@ -36,6 +35,8 @@ class DriSurface : public SurfaceOzoneCanvas {
  private:
   void UpdateNativeSurface(const gfx::Rect& damage);
 
+  DriWindowDelegate* window_delegate_;
+
   // Stores the connection to the graphics card. Pointer not owned by this
   // class.
   DriWrapper* dri_;
@@ -48,7 +49,6 @@ class DriSurface : public SurfaceOzoneCanvas {
 
   skia::RefPtr<SkSurface> surface_;
   gfx::Rect last_damage_;
-  base::WeakPtr<HardwareDisplayController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(DriSurface);
 };