Chromium Code Reviews| Index: ui/events/x/events_x.cc |
| diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc |
| index 03b7e28d8de9704453e90d7dde5a6e126667863b..a6498421a2fad80bf8d6b2310446e79d3a4a80a1 100644 |
| --- a/ui/events/x/events_x.cc |
| +++ b/ui/events/x/events_x.cc |
| @@ -399,7 +399,10 @@ int EventFlagsFromNative(const base::NativeEvent& native_event) { |
| case KeyPress: |
| case KeyRelease: { |
| XModifierStateWatcher::GetInstance()->UpdateStateFromXEvent(native_event); |
| - return GetEventFlagsFromXKeyEvent(native_event); |
| + int flags = GetEventFlagsFromXKeyEvent(native_event); |
| + if (native_event->xkey.send_event) |
| + flags |= EF_FINAL_MODIFIERS; |
| + return flags; |
| } |
| case ButtonPress: |
| case ButtonRelease: { |
| @@ -453,7 +456,10 @@ int EventFlagsFromNative(const base::NativeEvent& native_event) { |
| case XI_KeyRelease: { |
| XModifierStateWatcher::GetInstance()->UpdateStateFromXEvent( |
| native_event); |
| - return GetEventFlagsFromXGenericEvent(native_event); |
| + int flags = GetEventFlagsFromXGenericEvent(native_event); |
|
sadrul
2014/07/15 04:48:07
Update GetEventFlagsFromXKeyEvent() and GetEventFl
kpschoedel
2014/07/15 14:27:46
Done.
|
| + if (native_event->xkey.send_event) |
| + flags |= EF_FINAL_MODIFIERS; |
| + return flags; |
| } |
| } |
| } |