events: Move EventTarget into Event.

ui/views/widget/desktop_native_widget_aura.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 "ui/views/widget/desktop_native_widget_aura.h"
 
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/desktop_root_window_host.h"
 
 namespace views {
@@ skipping 284 matching lines @@
 void DesktopNativeWidgetAura::OnBoundsChanged(const gfx::Rect& old_bounds,
                                const gfx::Rect& new_bounds) {
 }
 
 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 gfx::kNullCursor;
 }
 
 int DesktopNativeWidgetAura::GetNonClientComponent(
     const gfx::Point& point) const {
   return HTCLIENT;
 }
 
 bool DesktopNativeWidgetAura::ShouldDescendIntoChildForEventHandling(
       aura::Window* child,
       const gfx::Point& location) {
   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;
 }
 
 void DesktopNativeWidgetAura::OnCaptureLost() {
 }
 
 void DesktopNativeWidgetAura::OnPaint(gfx::Canvas* canvas) {
 }
 
@@ skipping 10 matching lines @@
 void DesktopNativeWidgetAura::OnWindowTargetVisibilityChanged(bool visible) {
 }
 
 bool DesktopNativeWidgetAura::HasHitTestMask() const {
   return false;
 }
 
 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