Refactors away method implementations in ui::EventTargeter

ui/events/event_targeter.cc

Index: ui/events/event_targeter.cc
diff --git a/ui/events/event_targeter.cc b/ui/events/event_targeter.cc
index 5d43b29ba941114c7357ea8c930800d8272dff64..d93a995ccd6af930d54b081764ac51f111f6766a 100644
--- a/ui/events/event_targeter.cc
+++ b/ui/events/event_targeter.cc
@@ -15,18 +15,10 @@ EventTargeter::~EventTargeter() {
 
 EventTarget* EventTargeter::FindTargetForEvent(EventTarget* root,
                                                Event* event) {
-  if (event->IsMouseEvent() ||
-      event->IsScrollEvent() ||
-      event->IsTouchEvent() ||
-      event->IsGestureEvent()) {
-    return FindTargetForLocatedEvent(root,
-                                     static_cast<LocatedEvent*>(event));
-  }
-  return root;
-}
+  if (!event->IsLocatedEvent())
+    return root;
+  LocatedEvent* located_event = static_cast<LocatedEvent*>(event);
 
-EventTarget* EventTargeter::FindTargetForLocatedEvent(EventTarget* root,
-                                                      LocatedEvent* event) {
   scoped_ptr<EventTargetIterator> iter = root->GetChildIterator();
   if (iter) {
     EventTarget* target = root;
@@ -35,39 +27,21 @@ EventTarget* EventTargeter::FindTargetForLocatedEvent(EventTarget* root,
       EventTargeter* targeter = child->GetEventTargeter();
       if (!targeter)
         targeter = this;
-      if (!targeter->SubtreeShouldBeExploredForEvent(child, *event))
-        continue;
-      target->ConvertEventToTarget(child, event);
+      target->ConvertEventToTarget(child, located_event);
       target = child;
       EventTarget* child_target =
-          targeter->FindTargetForLocatedEvent(child, event);
+          targeter->FindTargetForEvent(child, located_event);
       if (child_target)
         return child_target;
     }
-    target->ConvertEventToTarget(root, event);
+    target->ConvertEventToTarget(root, located_event);
   }
   return root->CanAcceptEvent(*event) ? root : NULL;
 }
 
-bool EventTargeter::SubtreeShouldBeExploredForEvent(EventTarget* target,
-                                                    const LocatedEvent& event) {
-  return SubtreeCanAcceptEvent(target, event) &&
-         EventLocationInsideBounds(target, event);
-}
-
 EventTarget* EventTargeter::FindNextBestTarget(EventTarget* previous_target,
                                                Event* event) {
   return NULL;
 }
 
-bool EventTargeter::SubtreeCanAcceptEvent(EventTarget* target,
-                                          const LocatedEvent& event) const {
-  return true;
-}
-
-bool EventTargeter::EventLocationInsideBounds(EventTarget* target,
-                                              const LocatedEvent& event) const {
-  return true;
-}
-
 }  // namespace ui