events: Move EventTarget into Event.

ui/views/widget/native_widget_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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_change_observer.h"
@@ skipping 725 matching lines @@
   // destruction unless WIDGET_OWNS_NATIVE_WIDGET is set (which is just the case
   // in tests).
   if (!destroying_)
     GetWidget()->GetInputMethod()->OnBlur();
   else
     DCHECK_EQ(ownership_, Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET);
 
   delegate_->OnNativeBlur(window_->GetFocusManager()->GetFocusedWindow());
 }
 
-bool NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
-  if (event->is_char()) {
-    // If a ui::InputMethod object is attached to the root window, character
-    // events are handled inside the object and are not passed to this function.
-    // If such object is not attached, character events might be sent (e.g. on
-    // Windows). In this case, we just skip these.
-    return false;
-  }
-  // Renderer may send a key event back to us if the key event wasn't handled,
-  // and the window may be invisible by that time.
-  if (!window_->IsVisible())
-    return false;
-  GetWidget()->GetInputMethod()->DispatchKeyEvent(*event);
-  return true;
-}
-
 gfx::NativeCursor NativeWidgetAura::GetCursor(const gfx::Point& point) {
   return cursor_;
 }
 
 int NativeWidgetAura::GetNonClientComponent(const gfx::Point& point) const {
   return delegate_->GetNonClientComponent(point);
 }
 
 bool NativeWidgetAura::ShouldDescendIntoChildForEventHandling(
       aura::Window* child,
@@ skipping 23 matching lines @@
       Layers::const_iterator root_layer_iter(
           std::find(window_->layer()->children().begin(),
                     window_->layer()->children().end(), layer));
       if (root_layer_iter > child_layer_iter)
         return false;
     }
   }
   return true;
 }
 
-bool NativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
-  DCHECK(window_->IsVisible());
-  if (event->type() == ui::ET_MOUSEWHEEL)
-    return delegate_->OnMouseEvent(*event);
-
-  if (event->type() == ui::ET_SCROLL) {
-    if (delegate_->OnMouseEvent(*event))
-      return true;
-
-    // Convert unprocessed scroll events into wheel events.
-    ui::MouseWheelEvent mwe(*static_cast<ui::ScrollEvent*>(event));
-    return delegate_->OnMouseEvent(mwe);
-  }
-  if (tooltip_manager_.get())
-    tooltip_manager_->UpdateTooltip();
-  return delegate_->OnMouseEvent(*event);
-}
-
-ui::TouchStatus NativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
-  DCHECK(window_->IsVisible());
-  return delegate_->OnTouchEvent(*event);
-}
-
-ui::EventResult NativeWidgetAura::OnGestureEvent(
-    ui::GestureEvent* event) {
-  DCHECK(window_->IsVisible());
-  return delegate_->OnGestureEvent(*event);
-}
-
 bool NativeWidgetAura::CanFocus() {
   return can_activate_;
 }
 
 void NativeWidgetAura::OnCaptureLost() {
   delegate_->OnMouseCaptureLost();
 }
 
 void NativeWidgetAura::OnPaint(gfx::Canvas* canvas) {
   delegate_->OnNativeWidgetPaint(canvas);
@@ skipping 25 matching lines @@
 bool NativeWidgetAura::HasHitTestMask() const {
   return delegate_->HasHitTestMask();
 }
 
 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const {
   DCHECK(mask);
   delegate_->GetHitTestMask(mask);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// NativeWidgetAura, ui::EventHandler implementation:
+
+ui::EventResult NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
+  if (event->is_char()) {
+    // If a ui::InputMethod object is attached to the root window, character
+    // events are handled inside the object and are not passed to this function.
+    // If such object is not attached, character events might be sent (e.g. on
+    // Windows). In this case, we just skip these.
+    return ui::ER_UNHANDLED;
+  }
+  // Renderer may send a key event back to us if the key event wasn't handled,
+  // and the window may be invisible by that time.
+  if (!window_->IsVisible())
+    return ui::ER_UNHANDLED;
+  GetWidget()->GetInputMethod()->DispatchKeyEvent(*event);
+  return ui::ER_HANDLED;
+}
+
+ui::EventResult NativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
+  DCHECK(window_->IsVisible());
+  if (event->type() == ui::ET_MOUSEWHEEL)
+    return delegate_->OnMouseEvent(*event) ? ui::ER_HANDLED : ui::ER_UNHANDLED;
+
+  if (event->type() == ui::ET_SCROLL) {
+    if (delegate_->OnMouseEvent(*event))
+      return ui::ER_HANDLED;
+
+    // Convert unprocessed scroll events into wheel events.
+    ui::MouseWheelEvent mwe(*static_cast<ui::ScrollEvent*>(event));
+    return delegate_->OnMouseEvent(mwe) ? ui::ER_HANDLED : ui::ER_UNHANDLED;
+  }
+  if (tooltip_manager_.get())
+    tooltip_manager_->UpdateTooltip();
+  return delegate_->OnMouseEvent(*event) ? ui::ER_HANDLED : ui::ER_UNHANDLED;
+}
+
+ui::TouchStatus NativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
+  DCHECK(window_->IsVisible());
+  return delegate_->OnTouchEvent(*event);
+}
+
+ui::EventResult NativeWidgetAura::OnGestureEvent(ui::GestureEvent* event) {
+  DCHECK(window_->IsVisible());
+  return delegate_->OnGestureEvent(*event);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, aura::ActivationDelegate implementation:
 
 bool NativeWidgetAura::ShouldActivate(const ui::Event* event) {
   return can_activate_ && delegate_->CanActivate();
 }
 
 void NativeWidgetAura::OnActivated() {
   if (GetWidget()->HasFocusManager())
     GetWidget()->GetFocusManager()->RestoreFocusedView();
   delegate_->OnNativeWidgetActivationChanged(true);
@@ skipping 166 matching lines @@
   return aura::Env::GetInstance()->is_mouse_button_down();
 }
 
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
 }  // namespace internal
 }  // namespace views