Convert Aura to use ui::Event.

chrome/browser/ui/ash/event_rewriter.cc

 // Copyright (c) 2012 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/ui/ash/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
+#include "ui/base/event.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
 
 #if defined(OS_CHROMEOS)
 #include <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 
 // Get rid of a macro from Xlib.h that conflicts with OwnershipService class.
 #undef Status
 
@@ skipping 140 matching lines @@
       found_apple = true;
     if (!found_keyboard && LowerCaseEqualsASCII(tokens[i], "keyboard"))
       found_keyboard = true;
     if (found_apple && found_keyboard)
       return kDeviceAppleKeyboard;
   }
 
   return kDeviceUnknown;
 }
 
-void EventRewriter::RewriteForTesting(aura::KeyEvent* event) {
+void EventRewriter::RewriteForTesting(ui::KeyEvent* event) {
   Rewrite(event);
 }
 
 ash::EventRewriterDelegate::Action EventRewriter::RewriteOrFilterKeyEvent(
-    aura::KeyEvent* event) {
+    ui::KeyEvent* event) {
   if (event->HasNativeEvent())
     Rewrite(event);
   return ash::EventRewriterDelegate::ACTION_REWRITE_EVENT;
 }
 
 ash::EventRewriterDelegate::Action EventRewriter::RewriteOrFilterLocatedEvent(
-    aura::LocatedEvent* event) {
+    ui::LocatedEvent* event) {
   if (event->HasNativeEvent())
     RewriteLocatedEvent(event);
   return ash::EventRewriterDelegate::ACTION_REWRITE_EVENT;
 }
 
 void EventRewriter::OnKeyboardMappingChanged(const aura::RootWindow* root) {
 #if defined(OS_CHROMEOS)
   RefreshKeycodes();
 #endif
 }
@@ skipping 126 matching lines @@
       return kp_9_xkeycode_;
     case XK_KP_Decimal:
       return kp_decimal_xkeycode_;
     default:
       break;
   }
   return 0U;
 }
 #endif
 
-void EventRewriter::Rewrite(aura::KeyEvent* event) {
+void EventRewriter::Rewrite(ui::KeyEvent* event) {
 #if defined(OS_CHROMEOS)
   // Do not rewrite an event sent by ui_controls::SendKeyPress(). See
   // crbug.com/136465.
   if (event->native_event()->xkey.send_event)
     return;
 #endif
   RewriteModifiers(event);
   RewriteNumPadKeys(event);
   RewriteBackspaceAndArrowKeys(event);
   // TODO(yusukes): Implement crosbug.com/27167 (allow sending function keys).
@@ skipping 56 matching lines @@
 
   *remapped_flags =
       (original_flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)) |
       *remapped_flags;
   *remapped_native_modifiers =
       (original_native_modifiers & ~(Mod4Mask | ControlMask | Mod1Mask)) |
       *remapped_native_modifiers;
 #endif
 }
 
-bool EventRewriter::RewriteModifiers(aura::KeyEvent* event) {
+bool EventRewriter::RewriteModifiers(ui::KeyEvent* event) {
   // Do nothing if we have just logged in as guest but have not restarted chrome
   // process yet (so we are still on the login screen). In this situations we
   // have no user profile so can not do anything useful.
   // Note that currently, unlike other accounts, when user logs in as guest, we
   // restart chrome process. In future this is to be changed.
   // TODO(glotov): remove the following condition when we do not restart chrome
   // when user logs in as guest.
  #if defined(OS_CHROMEOS)
    if (chromeos::UserManager::Get()->IsLoggedInAsGuest() &&
        chromeos::BaseLoginDisplayHost::default_host())
@@ skipping 70 matching lines @@
   OverwriteEvent(event,
                  remapped_native_keycode, remapped_native_modifiers,
                  remapped_keycode, remapped_flags);
   return true;
 #else
   // TODO(yusukes): Support Ash on other platforms if needed.
   return false;
 #endif
 }
 
-bool EventRewriter::RewriteNumPadKeys(aura::KeyEvent* event) {
+bool EventRewriter::RewriteNumPadKeys(ui::KeyEvent* event) {
   bool rewritten = false;
 #if defined(OS_CHROMEOS)
   XEvent* xev = event->native_event();
   XKeyEvent* xkey = &(xev->xkey);
 
   const KeySym keysym = XLookupKeysym(xkey, 0);
   switch (keysym) {
     case XK_KP_Insert:
       OverwriteEvent(event, kp_0_xkeycode_, xkey->state | Mod2Mask,
                      ui::VKEY_NUMPAD0, event->flags());
@@ skipping 61 matching lines @@
       break;
     default:
       break;
   }
 #else
   // TODO(yusukes): Support Ash on other platforms if needed.
 #endif
   return rewritten;
 }
 
-bool EventRewriter::RewriteBackspaceAndArrowKeys(aura::KeyEvent* event) {
+bool EventRewriter::RewriteBackspaceAndArrowKeys(ui::KeyEvent* event) {
   bool rewritten = false;
 #if defined(OS_CHROMEOS)
   XEvent* xev = event->native_event();
   XKeyEvent* xkey = &(xev->xkey);
 
   const KeySym keysym = XLookupKeysym(xkey, 0);
   if (keysym == XK_BackSpace && (xkey->state & Mod1Mask)) {
     // Remap Alt+Backspace to Delete.
     OverwriteEvent(event, delete_xkeycode_, xkey->state & ~Mod1Mask,
                    ui::VKEY_DELETE, event->flags() & ~ui::EF_ALT_DOWN);
@@ skipping 26 matching lines @@
     OverwriteEvent(event, next_xkeycode_, xkey->state & ~Mod1Mask,
                    ui::VKEY_NEXT, event->flags() & ~ui::EF_ALT_DOWN);
     rewritten = true;
   }
 #else
   // TODO(yusukes): Support Ash on other platforms if needed.
 #endif
   return rewritten;
 }
 
-void EventRewriter::RewriteLocatedEvent(aura::LocatedEvent* event) {
+void EventRewriter::RewriteLocatedEvent(ui::LocatedEvent* event) {
 #if defined(OS_CHROMEOS)
   XEvent* xevent = event->native_event();
   if (!xevent || xevent->type != GenericEvent)
     return;
 
   XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xevent->xcookie.data);
   if (xievent->evtype != XI_ButtonPress && xievent->evtype != XI_ButtonRelease)
     return;
 
   // First, remap modifier masks.
@@ skipping 18 matching lines @@
 
   const int mouse_event_flags = event->flags() &
       (ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_TRIPLE_CLICK | ui::EF_IS_NON_CLIENT |
        ui::EF_IS_SYNTHESIZED | ui::EF_FROM_TOUCH);
   event->set_flags(mouse_event_flags | ui::EventFlagsFromNative(xevent));
 #else
   // TODO(yusukes): Support Ash on other platforms if needed.
 #endif
 }
 
-void EventRewriter::OverwriteEvent(aura::KeyEvent* event,
+void EventRewriter::OverwriteEvent(ui::KeyEvent* event,
                                    unsigned int new_native_keycode,
                                    unsigned int new_native_state,
                                    ui::KeyboardCode new_keycode,
                                    int new_flags) {
 #if defined(OS_CHROMEOS)
   XEvent* xev = event->native_event();
   XKeyEvent* xkey = &(xev->xkey);
   xkey->keycode = new_native_keycode;
   xkey->state = new_native_state;
   event->set_key_code(new_keycode);
@@ skipping 11 matching lines @@
   const DeviceType type = EventRewriter::GetDeviceType(device_name);
   if (type == kDeviceAppleKeyboard) {
     VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
             << "id=" << device_id;
   }
   // Always overwrite the existing device_id since the X server may reuse a
   // device id for an unattached device.
   device_id_to_type_[device_id] = type;
   return type;
 }