| 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 1ffd179820fd6340ec52574a7985e77189949255..a06e6e7bd93a12a860cff4932047d9e675687844 100644
|
| --- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
|
| +++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc
|
| @@ -26,8 +26,9 @@
|
| #include "ui/ozone/public/gpu_platform_support_host.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| -#include "ui/ozone/common/chromeos/native_display_delegate_ozone.h"
|
| #include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h"
|
| +#include "ui/ozone/platform/dri/chromeos/native_display_delegate_dri.h"
|
| +#include "ui/ozone/platform/dri/chromeos/native_display_delegate_proxy.h"
|
| #endif
|
|
|
| namespace ui {
|
| @@ -92,7 +93,8 @@ class OzonePlatformGbm : public OzonePlatform {
|
| #if defined(OS_CHROMEOS)
|
| virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
|
| OVERRIDE {
|
| - return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
|
| + return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy(
|
| + gpu_platform_support_host_.get(), device_manager_.get()));
|
| }
|
| virtual scoped_ptr<TouchscreenDeviceManager>
|
| CreateTouchscreenDeviceManager() OVERRIDE {
|
| @@ -128,6 +130,13 @@ class OzonePlatformGbm : public OzonePlatform {
|
|
|
| gpu_platform_support_.reset(
|
| new GpuPlatformSupportGbm(surface_factory_ozone_.get()));
|
| +#if defined(OS_CHROMEOS)
|
| + gpu_platform_support_->SetNativeDisplayDelegate(
|
| + scoped_ptr<NativeDisplayDelegateDri>(
|
| + new NativeDisplayDelegateDri(dri_.get(),
|
| + screen_manager_.get(),
|
| + NULL)));
|
| +#endif
|
| }
|
|
|
| private:
|
|
|