Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Unified Diff: ui/ozone/platform/dri/ozone_platform_dri.cc

Issue 250793005: Refactor Udev device support in Ozone and add a DRM hotplug monitor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/dri/chromeos/native_display_delegate_dri.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/ozone_platform_dri.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc
index bd0561f99966634022565d3eb70453e81072e6f8..09dadb31f632dcecf2d0a3712b44aea07a7e9ce1 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc
@@ -4,6 +4,7 @@
#include "ui/ozone/platform/dri/ozone_platform_dri.h"
+#include "ui/events/ozone/device/device_manager.h"
#include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
#include "ui/ozone/ime/input_method_context_factory_ozone.h"
@@ -26,8 +27,9 @@ namespace {
class OzonePlatformDri : public OzonePlatform {
public:
OzonePlatformDri()
- : cursor_factory_ozone_(&surface_factory_ozone_),
- event_factory_ozone_(&cursor_factory_ozone_) {}
+ : device_manager_(CreateDeviceManager()),
+ cursor_factory_ozone_(&surface_factory_ozone_),
+ event_factory_ozone_(&cursor_factory_ozone_, device_manager_.get()) {}
virtual ~OzonePlatformDri() {}
// OzonePlatform:
@@ -48,11 +50,14 @@ class OzonePlatformDri : public OzonePlatform {
virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate()
OVERRIDE {
return scoped_ptr<ui::NativeDisplayDelegate>(
- new NativeDisplayDelegateDri(&surface_factory_ozone_));
+ new NativeDisplayDelegateDri(&surface_factory_ozone_,
+ device_manager_.get()));
}
#endif
private:
+ scoped_ptr<DeviceManager> device_manager_;
+
ui::DriSurfaceFactory surface_factory_ozone_;
ui::CursorFactoryEvdevDri cursor_factory_ozone_;
ui::EventFactoryEvdev event_factory_ozone_;
« no previous file with comments | « ui/ozone/platform/dri/chromeos/native_display_delegate_dri.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698