| Index: ash/touch/touch_hud_debug.cc
|
| diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc
|
| index 20fab48588522cc2e61bc44186ee2d6108a32583..363b4794cc9e5a9286a220f6608668184d658772 100644
|
| --- a/ash/touch/touch_hud_debug.cc
|
| +++ b/ash/touch/touch_hud_debug.cc
|
| @@ -27,7 +27,7 @@
|
| #include <X11/extensions/XInput2.h>
|
| #include <X11/Xlib.h>
|
|
|
| -#include "ui/events/x/device_data_manager.h"
|
| +#include "ui/events/x/device_data_manager_x11.h"
|
| #endif
|
|
|
| namespace ash {
|
| @@ -73,10 +73,10 @@ int GetTrackingId(const ui::TouchEvent& event) {
|
| if (!event.HasNativeEvent())
|
| return 0;
|
| #if defined(USE_XI2_MT)
|
| - ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance();
|
| + ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
|
| double tracking_id;
|
| if (manager->GetEventData(*event.native_event(),
|
| - ui::DeviceDataManager::DT_TOUCH_TRACKING_ID,
|
| + ui::DeviceDataManagerX11::DT_TOUCH_TRACKING_ID,
|
| &tracking_id)) {
|
| return static_cast<int>(tracking_id);
|
| }
|
|
|