Revert of Avoid two targeting phases in aura client-lib and EventProcessor.

ui/views/widget/root_view.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/root_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 234 matching lines @@
   return focus_traversable_parent_;
 }
 
 View* RootView::GetFocusTraversableParentView() {
   return focus_traversable_parent_view_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootView, ui::EventProcessor overrides:
 
-ui::EventTarget* RootView::GetRootForEvent(ui::Event* event) {
+ui::EventTarget* RootView::GetRootTarget() {
   return this;
 }
 
-ui::EventTargeter* RootView::GetDefaultEventTargeter() {
-  return this->GetEventTargeter();
-}
-
 void RootView::OnEventProcessingStarted(ui::Event* event) {
   if (!event->IsGestureEvent())
     return;
 
   ui::GestureEvent* gesture_event = event->AsGestureEvent();
 
   // Do not process ui::ET_GESTURE_BEGIN events.
   if (gesture_event->type() == ui::ET_GESTURE_BEGIN) {
     event->SetHandled();
     return;
@@ skipping 483 matching lines @@
 
 #ifndef NDEBUG
   DCHECK(!event_dispatch_target_ || Contains(event_dispatch_target_));
 #endif
 
   return details;
 }
 
 }  // namespace internal
 }  // namespace views