events: Move EventTarget into Event.

ui/aura/event_filter.cc

Index: ui/aura/event_filter.cc
diff --git a/ui/aura/event_filter.cc b/ui/aura/event_filter.cc
index 9f2c35745a3d56d7d6a8c85d2d8a78bf08b654a8..d7f4719b468595fe4efca8f027da50c226829383 100644
--- a/ui/aura/event_filter.cc
+++ b/ui/aura/event_filter.cc
@@ -5,6 +5,7 @@
 #include "ui/aura/event_filter.h"
 
 #include "ui/aura/window.h"
+#include "ui/base/events/event.h"
 
 namespace aura {
 
@@ -26,31 +27,26 @@ ui::EventResult EventFilter::PreHandleGestureEvent(Window* target,
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult EventFilter::OnKeyEvent(ui::EventTarget* target,
-                                        ui::KeyEvent* event) {
-  return PreHandleKeyEvent(static_cast<Window*>(target), event) ?
+ui::EventResult EventFilter::OnKeyEvent(ui::KeyEvent* event) {
+  return PreHandleKeyEvent(static_cast<Window*>(event->target()), event) ?
       ui::ER_CONSUMED : ui::ER_UNHANDLED;
 }
 
-ui::EventResult EventFilter::OnMouseEvent(ui::EventTarget* target,
-                                          ui::MouseEvent* event) {
-  return PreHandleMouseEvent(static_cast<Window*>(target), event) ?
+ui::EventResult EventFilter::OnMouseEvent(ui::MouseEvent* event) {
+  return PreHandleMouseEvent(static_cast<Window*>(event->target()), event) ?
       ui::ER_CONSUMED : ui::ER_UNHANDLED;
 }
 
-ui::EventResult EventFilter::OnScrollEvent(ui::EventTarget* target,
-                                           ui::ScrollEvent* event) {
+ui::EventResult EventFilter::OnScrollEvent(ui::ScrollEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::TouchStatus EventFilter::OnTouchEvent(ui::EventTarget* target,
-                                          ui::TouchEvent* event) {
-  return PreHandleTouchEvent(static_cast<Window*>(target), event);
+ui::TouchStatus EventFilter::OnTouchEvent(ui::TouchEvent* event) {
+  return PreHandleTouchEvent(static_cast<Window*>(event->target()), event);
 }
 
-ui::EventResult EventFilter::OnGestureEvent(ui::EventTarget* target,
-                                            ui::GestureEvent* event) {
-  return PreHandleGestureEvent(static_cast<Window*>(target), event);
+ui::EventResult EventFilter::OnGestureEvent(ui::GestureEvent* event) {
+  return PreHandleGestureEvent(static_cast<Window*>(event->target()), event);
 }
 
 }  // namespace aura