Convert Aura to use ui::Event.

ash/accelerators/accelerator_dispatcher.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 "ash/accelerators/accelerator_dispatcher.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 
 // Xlib defines RootWindow
 #ifdef RootWindow
 #undef RootWindow
 #endif
 #endif  // defined(USE_X11)
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/event_rewriter_event_filter.h"
 #include "ui/aura/env.h"
-#include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/accelerators/accelerator.h"
+#include "ui/base/event.h"
 #include "ui/base/events.h"
 
 namespace ash {
 namespace {
 
 const int kModifierMask = (ui::EF_SHIFT_DOWN |
                            ui::EF_CONTROL_DOWN |
                            ui::EF_ALT_DOWN);
 #if defined(OS_WIN)
 bool IsKeyEvent(const MSG& msg) {
@@ skipping 29 matching lines @@
 
 bool AcceleratorDispatcher::Dispatch(const base::NativeEvent& event) {
   if (!associated_window_)
     return false;
   if (!ui::IsNoopEvent(event) && !associated_window_->CanReceiveEvents())
     return aura::Env::GetInstance()->GetDispatcher()->Dispatch(event);
 
   if (IsKeyEvent(event)) {
     // Modifiers can be changed by the user preference, so we need to rewrite
     // the event explicitly.
-    aura::KeyEvent key_event(event, false);
+    ui::KeyEvent key_event(event, false);
     aura::EventFilter* event_rewriter =
         ash::Shell::GetInstance()->event_rewriter_filter();
     DCHECK(event_rewriter);
     if (event_rewriter->PreHandleKeyEvent(associated_window_, &key_event))
       return true;
 
     ash::AcceleratorController* accelerator_controller =
         ash::Shell::GetInstance()->accelerator_controller();
     if (accelerator_controller) {
       ui::Accelerator accelerator(key_event.key_code(),
                                   key_event.flags() & kModifierMask);
       if (key_event.type() == ui::ET_KEY_RELEASED)
         accelerator.set_type(ui::ET_KEY_RELEASED);
       if (accelerator_controller->Process(accelerator))
         return true;
     }
 
     return nested_dispatcher_->Dispatch(key_event.native_event());
   }
 
   return nested_dispatcher_->Dispatch(event);
 }
 
 }  // namespace ash