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

Unified Diff: ui/ozone/platform/egltest/ozone_platform_egltest.cc

Issue 281283002: ozone: evdev: Fix cursorless constructor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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
Index: ui/ozone/platform/egltest/ozone_platform_egltest.cc
diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
index 579aa683db89835a7dcc859423099677188bf8cf..d45cb225bfc8263a232cfcc1f5c7bd33abd61684 100644
--- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc
+++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
@@ -10,6 +10,7 @@
#include "base/path_service.h"
#include "library_loaders/libeglplatform_shim.h"
#include "ui/base/cursor/ozone/cursor_factory_ozone.h"
+#include "ui/events/ozone/device/device_manager.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
#include "ui/gfx/ozone/impl/file_surface_factory.h"
#include "ui/gfx/ozone/surface_ozone_egl.h"
@@ -205,7 +206,10 @@ const int32* SurfaceFactoryEgltest::GetEGLSurfaceProperties(
class OzonePlatformEgltest : public OzonePlatform {
public:
OzonePlatformEgltest()
- : surface_factory_ozone_(&eglplatform_shim_), shim_initialized_(false) {}
+ : device_manager_(CreateDeviceManager()),
+ surface_factory_ozone_(&eglplatform_shim_),
+ event_factory_ozone_(NULL, device_manager_.get()),
+ shim_initialized_(false) {}
virtual ~OzonePlatformEgltest() {
if (shim_initialized_)
eglplatform_shim_.ShimTerminate();
@@ -257,6 +261,7 @@ class OzonePlatformEgltest : public OzonePlatform {
private:
LibeglplatformShimLoader eglplatform_shim_;
+ scoped_ptr<DeviceManager> device_manager_;
SurfaceFactoryEgltest surface_factory_ozone_;
EventFactoryEvdev event_factory_ozone_;
InputMethodContextFactoryOzone input_method_context_factory_ozone_;

Powered by Google App Engine
This is Rietveld 408576698