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 344422ba9e55fa0103fa569d8127ea1180857481..fc784aff5e04cfe6ea5db88949222fa5a533e884 100644 |
--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc |
+++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc |
@@ -13,6 +13,7 @@ |
#include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" |
#include "ui/events/ozone/device/device_manager.h" |
#include "ui/events/ozone/evdev/event_factory_evdev.h" |
+#include "ui/ozone/platform/dri/display_manager.h" |
#include "ui/ozone/platform/dri/dri_cursor.h" |
#include "ui/ozone/platform/dri/dri_gpu_platform_support.h" |
#include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h" |
@@ -102,17 +103,21 @@ class OzonePlatformGbm : public OzonePlatform { |
bounds, |
gpu_platform_support_host_.get(), |
event_factory_ozone_.get(), |
- window_manager_.get())); |
+ window_manager_.get(), |
+ display_manager_.get())); |
platform_window->Initialize(); |
return platform_window.Pass(); |
} |
virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() |
override { |
- return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy( |
- gpu_platform_support_host_.get(), device_manager_.get())); |
+ return scoped_ptr<NativeDisplayDelegate>( |
+ new NativeDisplayDelegateProxy(gpu_platform_support_host_.get(), |
+ device_manager_.get(), |
+ display_manager_.get())); |
} |
virtual void InitializeUI() override { |
vt_manager_.reset(new VirtualTerminalManager()); |
+ display_manager_.reset(new DisplayManager()); |
// Needed since the browser process creates the accelerated widgets and that |
// happens through SFO. |
surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_)); |
@@ -169,6 +174,8 @@ class OzonePlatformGbm : public OzonePlatform { |
// Browser side object only. |
scoped_ptr<DriWindowManager> window_manager_; |
+ scoped_ptr<DisplayManager> display_manager_; |
+ |
DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm); |
}; |