events: Move EventTarget into Event.

ui/aura/event_filter_unittest.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/event_filter.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 38 matching lines @@
   void set_key_event_handling_result(ui::EventResult result) {
     key_event_handling_result_ = result;
   }
   void set_mouse_event_handling_result(ui::EventResult result) {
     mouse_event_handling_result_ = result;
   }
   void set_consumes_touch_events(bool consumes_touch_events) {
     consumes_touch_events_ = consumes_touch_events;
   }
 
-  // Overridden from TestWindowDelegate:
-  virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
-    return key_event_handling_result_ != ui::ER_UNHANDLED;
+  // Overridden from EventHandler:
+  virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
+    ++key_event_count_;
+    return key_event_handling_result_;
   }
-  virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
-    return mouse_event_handling_result_ != ui::ER_UNHANDLED;
+
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+    ++mouse_event_count_;
+    return mouse_event_handling_result_;
   }
+
   virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     ++touch_event_count_;
     // TODO(sadrul): !
     return ui::TOUCH_STATUS_UNKNOWN;
   }
-  virtual ui::EventResult OnGestureEvent(
-      ui::GestureEvent* event) OVERRIDE {
+
+  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
     // TODO(sadrul): !
     return ui::ER_UNHANDLED;
   }
-
-  // Overridden from EventHandler:
-  virtual ui::EventResult OnKeyEvent(ui::EventTarget* target,
-                                     ui::KeyEvent* event) OVERRIDE {
-    ++key_event_count_;
-    if (key_event_handling_result_ & ui::ER_CONSUMED)
-      return key_event_handling_result_;
-    return WindowDelegate::OnKeyEvent(target, event);
-  }
-
-  virtual ui::EventResult OnMouseEvent(ui::EventTarget* target,
-                                       ui::MouseEvent* event) OVERRIDE {
-    ++mouse_event_count_;
-    if (mouse_event_handling_result_ & ui::ER_CONSUMED)
-      return mouse_event_handling_result_;
-    return WindowDelegate::OnMouseEvent(target, event);
-  }
-
  private:
   int key_event_count_;
   int mouse_event_count_;
   int touch_event_count_;
   ui::EventResult key_event_handling_result_;
   ui::EventResult mouse_event_handling_result_;
   bool consumes_touch_events_;
 
   DISALLOW_COPY_AND_ASSIGN(TestEventFilterWindowDelegate);
 };
@@ skipping 205 matching lines @@
   generator.PressKey(ui::VKEY_A, 0);
   generator.PressLeftButton();
 
   EXPECT_EQ(1, w1_filter->key_event_count());
   EXPECT_EQ(0, d11.key_event_count());
   EXPECT_EQ(1, w1_filter->mouse_event_count());
   EXPECT_EQ(0, d11.mouse_event_count());
 }
 
 }  // namespace aura