events: Move EventTarget into Event.

ui/views/widget/desktop_native_widget_aura.cc

Index: ui/views/widget/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_native_widget_aura.cc b/ui/views/widget/desktop_native_widget_aura.cc
index 2a04b96ae0a452390da6bb3882f9a9d1a5d163bd..4bb2aaa1aec2450ae98470399df5bdf3d5d77874 100644
--- a/ui/views/widget/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_native_widget_aura.cc
@@ -302,10 +302,6 @@ void DesktopNativeWidgetAura::OnFocus(aura::Window* old_focused_window) {
 void DesktopNativeWidgetAura::OnBlur() {
 }
 
-bool DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
-  return false;
-}
-
 gfx::NativeCursor DesktopNativeWidgetAura::GetCursor(const gfx::Point& point) {
   return NULL;
 }
@@ -321,19 +317,6 @@ bool DesktopNativeWidgetAura::ShouldDescendIntoChildForEventHandling(
   return true;
 }
 
-bool DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
-  return false;
-}
-
-ui::TouchStatus DesktopNativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
-  return ui::TOUCH_STATUS_UNKNOWN;
-}
-
-ui::EventResult DesktopNativeWidgetAura::OnGestureEvent(
-    ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 bool DesktopNativeWidgetAura::CanFocus() {
   return true;
 }
@@ -364,4 +347,24 @@ bool DesktopNativeWidgetAura::HasHitTestMask() const {
 void DesktopNativeWidgetAura::GetHitTestMask(gfx::Path* mask) const {
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// DesktopNativeWidgetAura, ui::EventHandler implementation:
+
+ui::EventResult DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
+ui::EventResult DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
+ui::TouchStatus DesktopNativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
+  return ui::TOUCH_STATUS_UNKNOWN;
+}
+
+ui::EventResult DesktopNativeWidgetAura::OnGestureEvent(
+    ui::GestureEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
 }  // namespace views