events: Move EventTarget into Event.

content/browser/web_contents/web_contents_view_aura.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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
@@ skipping 478 matching lines @@
   if (delegate_.get())
     delegate_->SizeChanged(new_bounds.size());
 }
 
 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;
 }
 
 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const {
   return HTCLIENT;
 }
 
 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling(
     aura::Window* child,
     const gfx::Point& location) {
   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.
   return view_ != NULL;
 }
 
 void WebContentsViewAura::OnCaptureLost() {
 }
 
 void WebContentsViewAura::OnPaint(gfx::Canvas* canvas) {
@@ skipping 17 matching lines @@
 }
 
 bool WebContentsViewAura::HasHitTestMask() const {
   return false;
 }
 
 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) {
   if (drag_dest_delegate_)
     drag_dest_delegate_->DragInitialize(web_contents_);
 
   WebDropData drop_data;
   PrepareWebDropData(&drop_data, event.data());
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
 
@@ skipping 42 matching lines @@
     OnDragEntered(event);
 
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
       gfx::Screen::GetCursorScreenPoint(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   return current_drag_op_;
 }