summaryrefslogtreecommitdiffstats
path: root/ash/touch
diff options
context:
space:
mode:
Diffstat (limited to 'ash/touch')
-rw-r--r--ash/touch/touch_observer_hud.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index e628f89..a9ac307 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -36,7 +36,7 @@
#include <X11/extensions/XInput2.h>
#include <X11/Xlib.h>
-#include "ui/base/x/valuators.h"
+#include "ui/base/x/device_data_manager.h"
#endif
namespace ash {
@@ -88,11 +88,11 @@ int GetTrackingId(const ui::TouchEvent& event) {
if (!event.HasNativeEvent())
return 0;
#if defined(USE_XI2_MT)
- ui::ValuatorTracker* valuators = ui::ValuatorTracker::GetInstance();
+ ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance();
double tracking_id;
- if (valuators->ExtractValuator(*event.native_event(),
- ui::ValuatorTracker::VAL_TRACKING_ID,
- &tracking_id)) {
+ if (manager->GetEventData(*event.native_event(),
+ ui::DeviceDataManager::DT_TOUCH_TRACKING_ID,
+ &tracking_id)) {
return static_cast<int>(tracking_id);
}
#endif