Index: ash/wm/maximize_mode/internal_input_device_list_x11.cc |
diff --git a/ash/wm/maximize_mode/internal_input_device_list_x11.cc b/ash/wm/maximize_mode/internal_input_device_list_x11.cc |
index 9a490ec6197f9f3c30f4e87003e7eb177e7de531..f97b44ba8f19b3a0ec0a671292ecb606cf6fdfad 100644 |
--- a/ash/wm/maximize_mode/internal_input_device_list_x11.cc |
+++ b/ash/wm/maximize_mode/internal_input_device_list_x11.cc |
@@ -44,7 +44,9 @@ InternalInputDeviceListX11::~InternalInputDeviceListX11() { |
bool InternalInputDeviceListX11::IsEventFromInternalDevice( |
const ui::Event* event) { |
- if (!event->HasNativeEvent()) |
+ // Key events are currently not XI2 events so we can't check the source device |
+ // id and assume not internal. |
+ if (event->IsKeyEvent() || !event->HasNativeEvent()) |
return false; |
XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>( |
sadrul
2014/05/23 17:21:57
CHECK that event->native_event()->type == GenericE
sadrul
2014/05/23 17:22:34
s/CHECK/Check/, as in, early return if not Generic
flackr
2014/05/23 17:30:28
Done.
|
event->native_event()->xcookie.data); |