events: Move EventTarget into Event.

ui/aura/test/test_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/test/test_window_delegate.h"
 
 #include "base/stringprintf.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/hit_test.h"
@@ skipping 29 matching lines @@
 void TestWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds,
                                          const gfx::Rect& new_bounds) {
 }
 
 void TestWindowDelegate::OnFocus(Window* old_focused_window) {
 }
 
 void TestWindowDelegate::OnBlur() {
 }
 
-bool TestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) {
-  return false;
-}
-
 gfx::NativeCursor TestWindowDelegate::GetCursor(const gfx::Point& point) {
   return gfx::kNullCursor;
 }
 
 int TestWindowDelegate::GetNonClientComponent(const gfx::Point& point) const {
   return window_component_;
 }
 
 bool TestWindowDelegate::ShouldDescendIntoChildForEventHandling(
       Window* child,
       const gfx::Point& location) {
   return true;
 }
 
-bool TestWindowDelegate::OnMouseEvent(ui::MouseEvent* event) {
-  return false;
-}
-
-ui::TouchStatus TestWindowDelegate::OnTouchEvent(ui::TouchEvent* event) {
-  return ui::TOUCH_STATUS_UNKNOWN;
-}
-
-ui::EventResult TestWindowDelegate::OnGestureEvent(
-    ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 bool TestWindowDelegate::CanFocus() {
   return true;
 }
 
 void TestWindowDelegate::OnCaptureLost() {
 }
 
 void TestWindowDelegate::OnPaint(gfx::Canvas* canvas) {
 }
 
@@ skipping 12 matching lines @@
 void TestWindowDelegate::OnWindowTargetVisibilityChanged(bool visible) {
 }
 
 bool TestWindowDelegate::HasHitTestMask() const {
   return false;
 }
 
 void TestWindowDelegate::GetHitTestMask(gfx::Path* mask) const {
 }
 
+ui::EventResult TestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
+ui::EventResult TestWindowDelegate::OnMouseEvent(ui::MouseEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
+ui::TouchStatus TestWindowDelegate::OnTouchEvent(ui::TouchEvent* event) {
+  return ui::TOUCH_STATUS_UNKNOWN;
+}
+
+ui::EventResult TestWindowDelegate::OnGestureEvent(
+    ui::GestureEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ColorTestWindowDelegate
 
 ColorTestWindowDelegate::ColorTestWindowDelegate(SkColor color)
     : color_(color),
       last_key_code_(ui::VKEY_UNKNOWN) {
 }
 ColorTestWindowDelegate::~ColorTestWindowDelegate() {
 }
 
-bool ColorTestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) {
+ui::EventResult ColorTestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) {
   last_key_code_ = event->key_code();
-  return true;
+  return ui::ER_HANDLED;
 }
 void ColorTestWindowDelegate::OnWindowDestroyed() {
   delete this;
 }
 void ColorTestWindowDelegate::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawColor(color_, SkXfermode::kSrc_Mode);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MaskedWindowDelegate
@@ skipping 16 matching lines @@
 EventCountDelegate::EventCountDelegate()
   : mouse_enter_count_(0),
     mouse_move_count_(0),
     mouse_leave_count_(0),
     mouse_press_count_(0),
     mouse_release_count_(0),
     key_press_count_(0),
     key_release_count_(0) {
 }
 
-bool EventCountDelegate::OnMouseEvent(ui::MouseEvent* event) {
+ui::EventResult EventCountDelegate::OnKeyEvent(ui::KeyEvent* event) {
+  switch (event->type()) {
+    case ui::ET_KEY_PRESSED:
+      key_press_count_++;
+      break;
+    case ui::ET_KEY_RELEASED:
+      key_release_count_++;
+    default:
+      break;
+  }
+  return ui::ER_UNHANDLED;
+}
+
+ui::EventResult EventCountDelegate::OnMouseEvent(ui::MouseEvent* event) {
   switch (event->type()) {
     case ui::ET_MOUSE_MOVED:
       mouse_move_count_++;
       break;
     case ui::ET_MOUSE_ENTERED:
       mouse_enter_count_++;
       break;
     case ui::ET_MOUSE_EXITED:
       mouse_leave_count_++;
       break;
     case ui::ET_MOUSE_PRESSED:
       mouse_press_count_++;
       break;
     case ui::ET_MOUSE_RELEASED:
       mouse_release_count_++;
       break;
     default:
       break;
   }
-  return false;
-}
-
-bool EventCountDelegate::OnKeyEvent(ui::KeyEvent* event) {
-  switch (event->type()) {
-    case ui::ET_KEY_PRESSED:
-      key_press_count_++;
-      break;
-    case ui::ET_KEY_RELEASED:
-      key_release_count_++;
-    default:
-      break;
-  }
-  return false;
+  return ui::ER_UNHANDLED;
 }
 
 std::string EventCountDelegate::GetMouseMotionCountsAndReset() {
   std::string result = StringPrintf("%d %d %d",
                                     mouse_enter_count_,
                                     mouse_move_count_,
                                     mouse_leave_count_);
   mouse_enter_count_ = 0;
   mouse_move_count_ = 0;
   mouse_leave_count_ = 0;
@@ skipping 14 matching lines @@
   std::string result = StringPrintf("%d %d",
                                     key_press_count_,
                                     key_release_count_);
   key_press_count_ = 0;
   key_release_count_ = 0;
   return result;
 }
 
 }  // namespace test
 }  // namespace aura