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

Unified Diff: ui/ozone/platform/test/ozone_platform_test.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/test/ozone_platform_test.cc
diff --git a/ui/ozone/platform/test/ozone_platform_test.cc b/ui/ozone/platform/test/ozone_platform_test.cc
index da94ba4b3f7e1ab18de5dbd0036183b8e2451fc7..3976eb5562cd417cfee9322bb60af25e96034363 100644
--- a/ui/ozone/platform/test/ozone_platform_test.cc
+++ b/ui/ozone/platform/test/ozone_platform_test.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/files/file_path.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/ozone/ime/input_method_context_factory_ozone.h"
@@ -27,7 +28,9 @@ namespace {
class OzonePlatformTest : public OzonePlatform {
public:
OzonePlatformTest(const base::FilePath& dump_file)
- : surface_factory_ozone_(dump_file) {}
+ : device_manager_(CreateDeviceManager()),
+ surface_factory_ozone_(dump_file),
+ event_factory_ozone_(NULL, device_manager_.get()) {}
virtual ~OzonePlatformTest() {}
// OzonePlatform:
@@ -54,6 +57,7 @@ class OzonePlatformTest : public OzonePlatform {
#endif
private:
+ scoped_ptr<DeviceManager> device_manager_;
gfx::FileSurfaceFactory surface_factory_ozone_;
ui::EventFactoryEvdev event_factory_ozone_;
ui::InputMethodContextFactoryOzone input_method_context_factory_ozone_;

Powered by Google App Engine
This is Rietveld 408576698