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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/controls/menu/menu_controller_unittest.cc

Issue 289283015: Extract touchscreen device management into a generic manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 6 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/ozone_platform.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_controller_unittest.cc
diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc
index 1c98f95bc9c10cfe26db53c654787ff9c35900a3..95fd669b9ebeebc8048fe8bbcc066f39bac0a548 100644
--- a/ui/views/controls/menu/menu_controller_unittest.cc
+++ b/ui/views/controls/menu/menu_controller_unittest.cc
@@ -20,6 +20,7 @@
#undef Bool
#undef None
#include "ui/events/test/events_test_utils_x11.h"
+#include "ui/events/x/device_data_manager_x11.h"
#elif defined(USE_OZONE)
#include "ui/events/event.h"
#endif
@@ -39,7 +40,11 @@ class TestMenuItemView : public MenuItemView {
class TestPlatformEventSource : public ui::PlatformEventSource {
public:
- TestPlatformEventSource() {}
+ TestPlatformEventSource() {
+#if defined(USE_X11)
+ ui::DeviceDataManagerX11::CreateInstance();
+#endif
+ }
virtual ~TestPlatformEventSource() {}
uint32_t Dispatch(const ui::PlatformEvent& event) {
« no previous file with comments | « ui/ozone/ozone_platform.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698