event-rewrite: Clean up how events are rewritten.

chrome/browser/chromeos/keyboard_driven_event_rewriter.cc

Index: chrome/browser/chromeos/keyboard_driven_event_rewriter.cc
diff --git a/chrome/browser/chromeos/keyboard_driven_event_rewriter.cc b/chrome/browser/chromeos/keyboard_driven_event_rewriter.cc
index fff7b0069fee80b60b2c5f638abbe9e09c33fbce..a545c7c335b512f56b4b85d5ba8d667f8a9ec3e2 100644
--- a/chrome/browser/chromeos/keyboard_driven_event_rewriter.cc
+++ b/chrome/browser/chromeos/keyboard_driven_event_rewriter.cc
@@ -8,7 +8,7 @@
 
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
-#include "ui/events/event.h"
+#include "ui/events/event_utils.h"
 
 namespace chromeos {
 
@@ -34,35 +34,34 @@ KeyboardDrivenEventRewriter::KeyboardDrivenEventRewriter() {}
 KeyboardDrivenEventRewriter::~KeyboardDrivenEventRewriter() {}
 
 bool KeyboardDrivenEventRewriter::RewriteIfKeyboardDrivenOnLoginScreen(
-    ui::KeyEvent* event) {
+    XEvent* event) {
   if (!ShouldStripModifiersForArrowKeysAndEnter())
     return false;
 
   return RewriteEvent(event);
 }
 
-bool KeyboardDrivenEventRewriter::RewriteForTesting(ui::KeyEvent* event) {
+bool KeyboardDrivenEventRewriter::RewriteForTesting(XEvent* event) {
   return RewriteEvent(event);
 }
 
-bool KeyboardDrivenEventRewriter::RewriteEvent(ui::KeyEvent* event) {
-  if ((event->flags() & kModifierMask) != kModifierMask)
+bool KeyboardDrivenEventRewriter::RewriteEvent(XEvent* event) {
+  int flags = ui::EventFlagsFromNative(event);
+  if ((flags & kModifierMask) != kModifierMask)
     return false;
-
-  if (event->key_code() != ui::VKEY_LEFT &&
-      event->key_code() != ui::VKEY_RIGHT &&
-      event->key_code() != ui::VKEY_UP &&
-      event->key_code() != ui::VKEY_DOWN &&
-      event->key_code() != ui::VKEY_RETURN &&
-      event->key_code() != ui::VKEY_F6) {
+  ui::KeyboardCode key_code = ui::KeyboardCodeFromNative(event);
+
+  if (key_code != ui::VKEY_LEFT &&
+      key_code != ui::VKEY_RIGHT &&
+      key_code != ui::VKEY_UP &&
+      key_code != ui::VKEY_DOWN &&
+      key_code != ui::VKEY_RETURN &&
+      key_code != ui::VKEY_F6) {
     return false;
   }
 
-  XEvent* xev = event->native_event();
-  XKeyEvent* xkey = &(xev->xkey);
+  XKeyEvent* xkey = &(event->xkey);
   xkey->state &= ~(ControlMask | Mod1Mask | ShiftMask);
-  event->set_flags(event->flags() & ~kModifierMask);
-  event->NormalizeFlags();
   return true;
 }