Convert Aura to use ui::Event.

ui/views/events/event.h

+
 // 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.
 
 #ifndef UI_VIEWS_EVENTS_EVENT_H_
 #define UI_VIEWS_EVENTS_EVENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "ui/base/events.h"
 #include "ui/base/gestures/gesture_types.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 #include "ui/views/views_export.h"
 
 namespace ui {
+class Event;
 class OSExchangeData;
 }
 
-#if defined(USE_AURA)
-namespace aura {
-class Event;
-}
-#endif
 
 namespace views {
 
 #if defined(USE_AURA)
-typedef aura::Event* NativeEvent;
+typedef ui::Event* NativeEvent;
 #else
 typedef base::NativeEvent NativeEvent;
 #endif
 
 class View;
 
 namespace internal {
 class RootView;
 }
 
@@ skipping 415 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(GestureEventForTest);
 };
 
 #if defined(OS_WIN)
 int GetModifiersFromKeyState();
 #endif
 
 }  // namespace views
 
 #endif  // UI_VIEWS_EVENTS_EVENT_H_