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

Unified Diff: ui/base/x/x11_util.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/aura/window_tree_host_x11.cc ('k') | ui/events/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/x/x11_util.cc
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
index ddfb0aa66e19e52b03376a03ea194189c5a3cac5..4bcda8d8a4ab698872e18a7ef4a6a3b7af2c5ec0 100644
--- a/ui/base/x/x11_util.cc
+++ b/ui/base/x/x11_util.cc
@@ -40,7 +40,7 @@
#include "ui/base/x/x11_util_internal.h"
#include "ui/events/event_utils.h"
#include "ui/events/keycodes/keyboard_code_conversion_x.h"
-#include "ui/events/x/device_data_manager.h"
+#include "ui/events/x/device_data_manager_x11.h"
#include "ui/events/x/touch_factory_x11.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image_skia.h"
@@ -227,7 +227,7 @@ class XCustomCursorCache {
} // namespace
bool IsXInput2Available() {
- return DeviceDataManager::GetInstance()->IsXInput2Available();
+ return DeviceDataManagerX11::GetInstance()->IsXInput2Available();
}
static SharedMemorySupport DoQuerySharedMemorySupport(XDisplay* dpy) {
@@ -399,7 +399,7 @@ int CoalescePendingMotionEvents(const XEvent* xev,
if (next_event.type == GenericEvent &&
next_event.xgeneric.evtype == event_type &&
- !ui::DeviceDataManager::GetInstance()->IsCMTGestureEvent(
+ !ui::DeviceDataManagerX11::GetInstance()->IsCMTGestureEvent(
&next_event)) {
XIDeviceEvent* next_xievent =
static_cast<XIDeviceEvent*>(next_event.xcookie.data);
« no previous file with comments | « ui/aura/window_tree_host_x11.cc ('k') | ui/events/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698