events: Move EventTarget into Event.

ui/aura/window_delegate.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/aura/window_delegate.h"
 
 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) {
+ui::TouchStatus WindowDelegate::OnTouchEvent(ui::TouchEvent* event) {
+  return ui::TOUCH_STATUS_UNKNOWN;
+}
+
+ui::EventResult WindowDelegate::OnGestureEvent(ui::GestureEvent* event) {
+  return OnGestureEvent(event);
+}
+#endif
+
+ui::EventResult WindowDelegate::OnScrollEvent(ui::ScrollEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::TouchStatus WindowDelegate::OnTouchEvent(ui::EventTarget* target,
-                                             ui::TouchEvent* event) {
-  return ui::TOUCH_STATUS_UNKNOWN;
-}
-
-ui::EventResult WindowDelegate::OnGestureEvent(ui::EventTarget* target,
-                                               ui::GestureEvent* event) {
-  return OnGestureEvent(event);
-}
-
 }  // namespace aura