| Index: ui/events/devices/x11/device_data_manager_x11.cc
|
| diff --git a/ui/events/devices/x11/device_data_manager_x11.cc b/ui/events/devices/x11/device_data_manager_x11.cc
|
| index 0ac4f6d33030048d853de9bb20f58fe6d542bf9e..b0bd0e4b555b9be50f163fda8c074d0c8d342219 100644
|
| --- a/ui/events/devices/x11/device_data_manager_x11.cc
|
| +++ b/ui/events/devices/x11/device_data_manager_x11.cc
|
| @@ -801,20 +801,6 @@ double DeviceDataManagerX11::ExtractAndUpdateScrollOffset(
|
| return offset / axis->increment;
|
| }
|
|
|
| -bool DeviceDataManagerX11::TouchEventNeedsCalibrate(int touch_device_id) const {
|
| -#if defined(OS_CHROMEOS)
|
| - if (!base::SysInfo::IsRunningOnChromeOS())
|
| - return false;
|
| -
|
| - const std::vector<TouchscreenDevice>& touch_devices =
|
| - ui::DeviceDataManager::GetInstance()->touchscreen_devices();
|
| - std::vector<TouchscreenDevice>::const_iterator it = FindDeviceWithId(
|
| - touch_devices.begin(), touch_devices.end(), touch_device_id);
|
| - return it != touch_devices.end() && it->type == INPUT_DEVICE_INTERNAL;
|
| -#endif // defined(OS_CHROMEOS)
|
| - return false;
|
| -}
|
| -
|
| void DeviceDataManagerX11::SetDisabledKeyboardAllowedKeys(
|
| scoped_ptr<std::set<KeyboardCode> > excepted_keys) {
|
| DCHECK(!excepted_keys.get() ||
|
|
|