| Index: ui/events/x/touch_factory_x11.cc
|
| diff --git a/ui/events/x/touch_factory_x11.cc b/ui/events/x/touch_factory_x11.cc
|
| index 994f1ec80fdf70121fcb1add39d7840b3f902280..e016ea642a197d887fe3591619d8465db37dab92 100644
|
| --- a/ui/events/x/touch_factory_x11.cc
|
| +++ b/ui/events/x/touch_factory_x11.cc
|
| @@ -18,6 +18,7 @@
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_split.h"
|
| +#include "base/sys_info.h"
|
| #include "ui/events/event_switches.h"
|
| #include "ui/events/x/device_data_manager_x11.h"
|
| #include "ui/events/x/device_list_cache_x.h"
|
| @@ -210,6 +211,12 @@ void TouchFactory::SetupXI2ForXWindow(Window window) {
|
| XISetMask(mask, XI_ButtonPress);
|
| XISetMask(mask, XI_ButtonRelease);
|
| XISetMask(mask, XI_Motion);
|
| +#if defined(OS_CHROMEOS)
|
| + if (base::SysInfo::IsRunningOnChromeOS()) {
|
| + XISetMask(mask, XI_KeyPress);
|
| + XISetMask(mask, XI_KeyRelease);
|
| + }
|
| +#endif
|
|
|
| XIEventMask evmask;
|
| evmask.deviceid = XIAllDevices;
|
|
|