events: Move EventTarget into Event.

ui/base/events/event_target.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/base/events/event_target.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
+#include "ui/base/events/event.h"
 
 namespace ui {
 
 EventTarget::EventTarget()
     : target_handler_(NULL) {
 }
 
 EventTarget::~EventTarget() {
 }
 
@@ skipping 34 matching lines @@
   EventTarget* target = this;
   while (target) {
     for (EventHandlerList::iterator it = target->post_target_list().begin(),
         end = target->post_target_list().end(); it != end; ++it) {
       list->push_back(*it);
     }
     target = target->GetParentTarget();
   }
 }
 
-EventResult EventTarget::OnKeyEvent(EventTarget* target,
-                                    KeyEvent* event) {
-  CHECK_EQ(this, target);
-  return target_handler_ ? target_handler_->OnKeyEvent(target, event) :
+EventResult EventTarget::OnKeyEvent(KeyEvent* event) {
+  CHECK_EQ(this, event->target());
+  return target_handler_ ? target_handler_->OnKeyEvent(event) : ER_UNHANDLED;
+}
+
+EventResult EventTarget::OnMouseEvent(MouseEvent* event) {
+  CHECK_EQ(this, event->target());
+  return target_handler_ ? target_handler_->OnMouseEvent(event) : ER_UNHANDLED;
+}
+
+EventResult EventTarget::OnScrollEvent(ScrollEvent* event) {
+  CHECK_EQ(this, event->target());
+  return target_handler_ ? target_handler_->OnScrollEvent(event) : ER_UNHANDLED;
+}
+
+TouchStatus EventTarget::OnTouchEvent(TouchEvent* event) {
+  CHECK_EQ(this, event->target());
+  return target_handler_ ? target_handler_->OnTouchEvent(event) :
+                           TOUCH_STATUS_UNKNOWN;
+}
+
+EventResult EventTarget::OnGestureEvent(GestureEvent* event) {
+  CHECK_EQ(this, event->target());
+  return target_handler_ ? target_handler_->OnGestureEvent(event) :
                            ER_UNHANDLED;
 }
 
-EventResult EventTarget::OnMouseEvent(EventTarget* target,
-                                      MouseEvent* event) {
-  CHECK_EQ(this, target);
-  return target_handler_ ? target_handler_->OnMouseEvent(target, event) :
-                           ER_UNHANDLED;
-}
-
-EventResult EventTarget::OnScrollEvent(EventTarget* target,
-                                       ScrollEvent* event) {
-  CHECK_EQ(this, target);
-  return target_handler_ ? target_handler_->OnScrollEvent(target, event) :
-                           ER_UNHANDLED;
-}
-
-TouchStatus EventTarget::OnTouchEvent(EventTarget* target,
-                                      TouchEvent* event) {
-  CHECK_EQ(this, target);
-  return target_handler_ ? target_handler_->OnTouchEvent(target, event) :
-                           TOUCH_STATUS_UNKNOWN;
-}
-
-EventResult EventTarget::OnGestureEvent(EventTarget* target,
-                                        GestureEvent* event) {
-  CHECK_EQ(this, target);
-  return target_handler_ ? target_handler_->OnGestureEvent(target, event) :
-                           ER_UNHANDLED;
-}
-
 }  // namespace ui