event-rewrite: Clean up how events are rewritten.

chrome/browser/chromeos/keyboard_driven_event_rewriter.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_KEYBOARD_DRIVEN_EVENT_REWRITER_H_
 #define CHROME_BROWSER_CHROMEOS_KEYBOARD_DRIVEN_EVENT_REWRITER_H_
 
 #include "base/basictypes.h"
 
-namespace ui {
-class KeyEvent;
-}
+typedef union _XEvent XEvent;
 
 namespace chromeos {
 
 // KeyboardDrivenEventRewriter removes the modifier flags from
 // Shift+<Arrow keys|Enter|F6> key events. This mapping only happens
 // on login screen and only when the keyboard driven oobe is enabled.
 class KeyboardDrivenEventRewriter {
  public:
   KeyboardDrivenEventRewriter();
   ~KeyboardDrivenEventRewriter();
 
   // Calls RewriteEvent to modify |event| if it is on login screen and the
   // keyboard driven flag is enabled. Returns true if the event is changed
   // and no further changes should happen.
-  bool RewriteIfKeyboardDrivenOnLoginScreen(ui::KeyEvent* event);
+  bool RewriteIfKeyboardDrivenOnLoginScreen(XEvent* event);
 
   // Calls RewriteEvent for testing.
-  bool RewriteForTesting(ui::KeyEvent* event);
+  bool RewriteForTesting(XEvent* event);
 
  private:
-  bool RewriteEvent(ui::KeyEvent* event);
+  bool RewriteEvent(XEvent* event);
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardDrivenEventRewriter);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_KEYBOARD_DRIVEN_EVENT_REWRITER_H_