Add EF_FINAL_MODIFIERS to suppress remapping.

chrome/browser/chromeos/events/event_rewriter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/events/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/wm/window_state.h"
@@ skipping 147 matching lines @@
     case ui::EF_MIDDLE_MOUSE_BUTTON:
       *x_button = Button2;
       break;
     case ui::EF_RIGHT_MOUSE_BUTTON:
       *x_button = Button3;
       break;
   }
 }
 #endif  // defined(USE_X11)
 
-bool IsSendEvent(const ui::Event& event) {
-#if defined(USE_X11)
-  // Do not rewrite an event sent by ui_controls::SendKeyPress(). See
-  // crbug.com/136465.
-  XEvent* xev = event.native_event();
-  if (xev && xev->xany.send_event)
-    return true;
-#endif
-  return false;
-}
-
 }  // namespace
 
 EventRewriter::EventRewriter(ash::StickyKeysController* sticky_keys_controller)
     : last_keyboard_device_id_(ui::ED_UNKNOWN_DEVICE),
       ime_keyboard_for_testing_(NULL),
       pref_service_for_testing_(NULL),
       sticky_keys_controller_(sticky_keys_controller) {
 }
 
 EventRewriter::~EventRewriter() {
@@ skipping 193 matching lines @@
   }
   return false;
 }
 
 ui::EventRewriteStatus EventRewriter::RewriteKeyEvent(
     const ui::KeyEvent& key_event,
     scoped_ptr<ui::Event>* rewritten_event) {
   if (key_event.source_device_id() != ui::ED_UNKNOWN_DEVICE)
     DeviceKeyPressedOrReleased(key_event.source_device_id());
   MutableKeyState state = {key_event.flags(), key_event.key_code()};
-  bool is_send_event = IsSendEvent(key_event);
-  if (!is_send_event) {
+  // Do not rewrite an event sent by ui_controls::SendKeyPress(). See
+  // crbug.com/136465.
+  if (!(key_event.flags() & ui::EF_FINAL_MODIFIERS)) {
     RewriteModifierKeys(key_event, &state);
     RewriteNumPadKeys(key_event, &state);
   }
   ui::EventRewriteStatus status = ui::EVENT_REWRITE_CONTINUE;
   if (sticky_keys_controller_) {
     status = sticky_keys_controller_->RewriteKeyEvent(
         key_event, state.key_code, &state.flags);
     if (status == ui::EVENT_REWRITE_DISCARD)
       return ui::EVENT_REWRITE_DISCARD;
   }
-  if (!is_send_event) {

[sadrul, 2014/07/15 04:48:07]

Do you not need the check here anymore?

[kpschoedel, 2014/07/15 14:27:46]

It was never actually needed here. Before sticky keys was converted, these were
in one block with the, but there are no actual cases affected, and not wrapping
them is more consistent with the name EF_FINAL_MODIFIERS since they don't affect
modifiers.

[kpschoedel, 2014/07/16 20:18:25]

It turns out this is necessary; the
KeyboardAccessTest.TestMenuKeyboardOpenDismiss unit test was failing because it
requires a sent event not to be rewritten here.

Renamed the new flag EF_FINAL_MODIFIERS to EF_FINAL, since it turns out not to
be limited to modifiers.

-    RewriteExtendedKeys(key_event, &state);
-    RewriteFunctionKeys(key_event, &state);
-  }
+  RewriteExtendedKeys(key_event, &state);
+  RewriteFunctionKeys(key_event, &state);
   if ((key_event.flags() == state.flags) &&
       (key_event.key_code() == state.key_code) &&
 #if defined(USE_X11)
       // TODO(kpschoedel): This test is present because several consumers of
       // key events depend on having a native core X11 event, so we rewrite
       // all XI2 key events (GenericEvent) into corresponding core X11 key
       // events. Remove this when event consumers no longer care about
       // native X11 event details (crbug.com/380349).
       (!key_event.HasNativeEvent() ||
        (key_event.native_event()->type != GenericEvent)) &&
@@ skipping 519 matching lines @@
     KeyboardDeviceAddedInternal(device_info[i].deviceid, device_info[i].name);
   }
 
   XIFreeDeviceInfo(device_info);
 #else
   KeyboardDeviceAddedInternal(device_id, "keyboard");
 #endif
 }
 
 }  // namespace chromeos