[Ozone-GBM] Pumb DriWindowDelegate throughout the platform

ui/ozone/platform/dri/dri_window.h

Index: ui/ozone/platform/dri/dri_window.h
diff --git a/ui/ozone/platform/dri/dri_window.h b/ui/ozone/platform/dri/dri_window.h
index d13a5e6316ffe6fbf6335da54b3e6b7d531f4975..59d330a395272b7a37df7bd3ed4ce5b38a67dce6 100644
--- a/ui/ozone/platform/dri/dri_window.h
+++ b/ui/ozone/platform/dri/dri_window.h
@@ -5,6 +5,7 @@
 #ifndef UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
 #define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
 
+#include "base/memory/scoped_ptr.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
@@ -12,7 +13,8 @@
 
 namespace ui {
 
-class DriSurfaceFactory;
+class DriWindowDelegate;
+class DriWindowManager;
 class EventFactoryEvdev;
 
 class DriWindow : public PlatformWindow,
@@ -20,10 +22,13 @@ class DriWindow : public PlatformWindow,
  public:
   DriWindow(PlatformWindowDelegate* delegate,
             const gfx::Rect& bounds,
-            DriSurfaceFactory* surface_factory,
-            EventFactoryEvdev* event_factory);
+            scoped_ptr<DriWindowDelegate> dri_window_delegate,
+            EventFactoryEvdev* event_factory,
+            DriWindowManager* window_manager);
   virtual ~DriWindow();
 
+  void Initialize();
+
   // PlatformWindow:
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
@@ -47,7 +52,9 @@ class DriWindow : public PlatformWindow,
   PlatformWindowDelegate* delegate_;
   gfx::Rect bounds_;
   gfx::AcceleratedWidget widget_;
+  DriWindowDelegate* dri_window_delegate_;
   EventFactoryEvdev* event_factory_;
+  DriWindowManager* window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(DriWindow);
 };