events: Move EventTarget into Event.

ui/aura/window_delegate.cc

Index: ui/aura/window_delegate.cc
diff --git a/ui/aura/window_delegate.cc b/ui/aura/window_delegate.cc
index ba9c6330aaa135c373121bb526058b44901f5ae4..bea86e7c5d585b8dc0f54e2adf6c6a566f07c25f 100644
--- a/ui/aura/window_delegate.cc
+++ b/ui/aura/window_delegate.cc
@@ -6,29 +6,26 @@
 
 namespace aura {
 
-ui::EventResult WindowDelegate::OnKeyEvent(ui::EventTarget* target,
-                                           ui::KeyEvent* event) {
+#if 0

[Ben Goodger (Google), 2012/09/06 21:39:15]

que?

[sadrul, 2012/09/06 21:44:59]

Meant to remove the block. Done :)

+ui::EventResult WindowDelegate::OnKeyEvent(ui::KeyEvent* event) {
   return OnKeyEvent(event) ? ui::ER_HANDLED : ui::ER_UNHANDLED;
 }
 
-ui::EventResult WindowDelegate::OnMouseEvent(ui::EventTarget* target,
-                                             ui::MouseEvent* event) {
+ui::EventResult WindowDelegate::OnMouseEvent(ui::MouseEvent* event) {
   return OnMouseEvent(event) ? ui::ER_HANDLED : ui::ER_UNHANDLED;
 }
 
-ui::EventResult WindowDelegate::OnScrollEvent(ui::EventTarget* target,
-                                              ui::ScrollEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
-ui::TouchStatus WindowDelegate::OnTouchEvent(ui::EventTarget* target,
-                                             ui::TouchEvent* event) {
+ui::TouchStatus WindowDelegate::OnTouchEvent(ui::TouchEvent* event) {
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::EventResult WindowDelegate::OnGestureEvent(ui::EventTarget* target,
-                                               ui::GestureEvent* event) {
+ui::EventResult WindowDelegate::OnGestureEvent(ui::GestureEvent* event) {
   return OnGestureEvent(event);
 }
+#endif
+
+ui::EventResult WindowDelegate::OnScrollEvent(ui::ScrollEvent* event) {
+  return ui::ER_UNHANDLED;
+}
 
 }  // namespace aura