Convert KeyboardDrivenEventRewriter to a ui::EventRewriter.

chrome/browser/chromeos/events/keyboard_driven_event_rewriter.cc

 // Copyright 2013 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/keyboard_driven_event_rewriter.h"
 
-#include <X11/Xlib.h>
-
 #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 {
 
 namespace {
 
 const int kModifierMask = ui::EF_SHIFT_DOWN;
 
 // Returns true if and only if it is on login screen (i.e. user is not logged
 // in) and the keyboard driven flag in the OEM manifest is on.
 bool ShouldStripModifiersForArrowKeysAndEnter() {
   if (UserManager::IsInitialized() &&
       !UserManager::Get()->IsSessionStarted()) {
     return system::InputDeviceSettings::Get()

[kpschoedel, 2014/04/17 21:08:21]

It looks like this part of the test is fixed per platform, in which case we
could install this rewriter only in that case, and save the latency otherwise.

         ->ForceKeyboardDrivenUINavigation();
   }
 
   return false;
 }
 
 }  // namespace
 
 KeyboardDrivenEventRewriter::KeyboardDrivenEventRewriter() {}
 
 KeyboardDrivenEventRewriter::~KeyboardDrivenEventRewriter() {}
 
-bool KeyboardDrivenEventRewriter::RewriteIfKeyboardDrivenOnLoginScreen(
-    XEvent* event) {
-  if (!ShouldStripModifiersForArrowKeysAndEnter())
-    return false;
-
-  return RewriteEvent(event);
+ui::EventRewriteStatus KeyboardDrivenEventRewriter::RewriteForTesting(
+    const ui::Event& event,
+    scoped_ptr<ui::Event>* rewritten_event) {
+  return Rewrite(event, rewritten_event);
 }
 
-bool KeyboardDrivenEventRewriter::RewriteForTesting(XEvent* event) {
-  return RewriteEvent(event);
+ui::EventRewriteStatus KeyboardDrivenEventRewriter::RewriteEvent(
+    const ui::Event& event,
+    scoped_ptr<ui::Event>* rewritten_event) {
+  if (!ShouldStripModifiersForArrowKeysAndEnter())
+    return ui::EVENT_REWRITE_CONTINUE;
+
+  return Rewrite(event, rewritten_event);
 }
 
-bool KeyboardDrivenEventRewriter::RewriteEvent(XEvent* event) {
-  int flags = ui::EventFlagsFromNative(event);
+ui::EventRewriteStatus KeyboardDrivenEventRewriter::NextDispatchEvent(
+    const ui::Event& last_event,
+    scoped_ptr<ui::Event>* new_event) {
+  NOTREACHED();
+  return ui::EVENT_REWRITE_CONTINUE;
+}
+
+ui::EventRewriteStatus KeyboardDrivenEventRewriter::Rewrite(
+    const ui::Event& event,
+    scoped_ptr<ui::Event>* rewritten_event) {
+  int flags = event.flags();
   if ((flags & kModifierMask) != kModifierMask)
-    return false;
-  ui::KeyboardCode key_code = ui::KeyboardCodeFromNative(event);
+    return ui::EVENT_REWRITE_CONTINUE;
+
+  DCHECK(event.type() == ui::ET_KEY_PRESSED ||
+         event.type() == ui::ET_KEY_RELEASED);

[Daniel Erat, 2014/04/18 02:50:06]

nit: include the unexected event type in an error message here?

    << "Unexpected event type " << event.type();

+  const ui::KeyEvent& key_event = static_cast<const ui::KeyEvent&>(event);
+  ui::KeyboardCode key_code = key_event.key_code();
 
   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;
+    return ui::EVENT_REWRITE_CONTINUE;
   }
 
-  XKeyEvent* xkey = &(event->xkey);
-  xkey->state &= ~(ControlMask | Mod1Mask | ShiftMask);
-  return true;
+  rewritten_event->reset(new ui::KeyEvent(key_event));
+  rewritten_event->get()->set_flags(

[Daniel Erat, 2014/04/18 02:50:06]

does (*rewritten_event)->set_flags() work here?

+      flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN));
+  return ui::EVENT_REWRITE_REWRITTEN;
 }
 
 }  // namespace chromeos