[Ozone-GBM] Pumb DriWindowDelegate throughout the platform

ui/ozone/platform/dri/ozone_platform_gbm.cc

Index: ui/ozone/platform/dri/ozone_platform_gbm.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc
index 39cc5f266e76c836b3aa8b9debb8f35417612732..c0f9015bafee4be6f3fe839debbb75acb59cee92 100644
--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc
@@ -14,6 +14,7 @@
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/ozone/platform/dri/cursor_factory_evdev_dri.h"
 #include "ui/ozone/platform/dri/dri_window.h"
+#include "ui/ozone/platform/dri/dri_window_delegate_proxy.h"
 #include "ui/ozone/platform/dri/dri_window_manager.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/gbm_buffer.h"
@@ -100,7 +101,9 @@ class OzonePlatformGbm : public OzonePlatform {
     return scoped_ptr<PlatformWindow>(
         new DriWindow(delegate,
                       bounds,
-                      surface_factory_ozone_.get(),
+                      scoped_ptr<DriWindowDelegate>(new DriWindowDelegateProxy(

[alexst (slow to review), 2014/08/20 21:51:09]

make_scoped_ptr

+                          ui_window_manager_.NextAcceleratedWidget(),
+                          gpu_platform_support_host_.get())),
                       event_factory_ozone_.get()));
   }
 #if defined(OS_CHROMEOS)
@@ -120,7 +123,6 @@ class OzonePlatformGbm : public OzonePlatform {
     // Needed since the browser process creates the accelerated widgets and that
     // happens through SFO.
     surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
-
     device_manager_ = CreateDeviceManager();
     gpu_platform_support_host_.reset(new GpuPlatformSupportHostGbm());
     cursor_factory_ozone_.reset(
@@ -139,7 +141,8 @@ class OzonePlatformGbm : public OzonePlatform {
 
     surface_factory_ozone_->InitializeGpu(dri_.get(),
                                           buffer_generator_->device(),
-                                          screen_manager_.get());
+                                          screen_manager_.get(),
+                                          &gpu_window_manager_);
     gpu_platform_support_.reset(
         new GpuPlatformSupportGbm(surface_factory_ozone_.get(),
                                   &gpu_window_manager_,
@@ -173,6 +176,7 @@ class OzonePlatformGbm : public OzonePlatform {
   scoped_ptr<GpuPlatformSupportHostGbm> gpu_platform_support_host_;
 
   DriWindowManager gpu_window_manager_;
+  DriWindowManager ui_window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
 };