events: Move EventTarget into Event.

content/browser/web_contents/web_contents_view_aura.cc

Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 52a6268571497de2b9dfd519b98bf4d806509cf6..0870592db725b4ce2464b35406df2d1a7b4af1fd 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -496,10 +496,6 @@ void WebContentsViewAura::OnFocus(aura::Window* old_focused_window) {
 void WebContentsViewAura::OnBlur() {
 }
 
-bool WebContentsViewAura::OnKeyEvent(ui::KeyEvent* event) {
-  return false;
-}
-
 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) {
   return gfx::kNullCursor;
 }
@@ -514,33 +510,6 @@ bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling(
   return true;
 }
 
-bool WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) {
-  if (!web_contents_->GetDelegate())
-    return false;
-
-  switch (event->type()) {
-    case ui::ET_MOUSE_PRESSED:
-      web_contents_->GetDelegate()->ActivateContents(web_contents_);
-      break;
-    case ui::ET_MOUSE_MOVED:
-      web_contents_->GetDelegate()->ContentsMouseEvent(
-          web_contents_, gfx::Screen::GetCursorScreenPoint(), true);
-      break;
-    default:
-      break;
-  }
-  return false;
-}
-
-ui::TouchStatus WebContentsViewAura::OnTouchEvent(ui::TouchEvent* event) {
-  return ui::TOUCH_STATUS_UNKNOWN;
-}
-
-ui::EventResult WebContentsViewAura::OnGestureEvent(
-    ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
-}
-
 bool WebContentsViewAura::CanFocus() {
   // Do not take the focus if |view_| is gone because neither the view window
   // nor this window can handle key events.
@@ -578,6 +547,40 @@ void WebContentsViewAura::GetHitTestMask(gfx::Path* mask) const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// WebContentsViewAura, ui::EventHandler implementation:
+
+ui::EventResult WebContentsViewAura::OnKeyEvent(ui::KeyEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
+ui::EventResult WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) {
+  if (!web_contents_->GetDelegate())
+    return ui::ER_UNHANDLED;
+
+  switch (event->type()) {
+    case ui::ET_MOUSE_PRESSED:
+      web_contents_->GetDelegate()->ActivateContents(web_contents_);
+      break;
+    case ui::ET_MOUSE_MOVED:
+      web_contents_->GetDelegate()->ContentsMouseEvent(
+          web_contents_, gfx::Screen::GetCursorScreenPoint(), true);
+      break;
+    default:
+      break;
+  }
+  return ui::ER_UNHANDLED;
+}
+
+ui::TouchStatus WebContentsViewAura::OnTouchEvent(ui::TouchEvent* event) {
+  return ui::TOUCH_STATUS_UNKNOWN;
+}
+
+ui::EventResult WebContentsViewAura::OnGestureEvent(
+    ui::GestureEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, aura::client::DragDropDelegate implementation:
 
 void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {