View should store a ViewTargeter instead of an EventTargeter

ui/views/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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 1083 matching lines @@
 InputMethod* View::GetInputMethod() {
   Widget* widget = GetWidget();
   return widget ? widget->GetInputMethod() : NULL;
 }
 
 const InputMethod* View::GetInputMethod() const {
   const Widget* widget = GetWidget();
   return widget ? widget->GetInputMethod() : NULL;
 }
 
-scoped_ptr<ui::EventTargeter>
-View::SetEventTargeter(scoped_ptr<ui::EventTargeter> targeter) {
-  scoped_ptr<ui::EventTargeter> old_targeter = targeter_.Pass();
+scoped_ptr<ViewTargeter>
+View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
+  scoped_ptr<ViewTargeter> old_targeter = targeter_.Pass();
   targeter_ = targeter.Pass();
   return old_targeter.Pass();
 }
 
 bool View::CanAcceptEvent(const ui::Event& event) {
   return IsDrawn();
 }
 
 ui::EventTarget* View::GetParentTarget() {
   return parent_;
 }
 
 scoped_ptr<ui::EventTargetIterator> View::GetChildIterator() const {
   return scoped_ptr<ui::EventTargetIterator>(
       new ui::EventTargetIteratorImpl<View>(children_));
 }
 
+ViewTargeter* View::GetViewTargeter() const {
+  return targeter_.get();
+}
+
 ui::EventTargeter* View::GetEventTargeter() {
   return targeter_.get();
 }
 
 void View::ConvertEventToTarget(ui::EventTarget* target,
                                 ui::LocatedEvent* event) {
   event->ConvertLocationToTarget(this, static_cast<View*>(target));
 }
 
 // Accelerators ----------------------------------------------------------------
@@ skipping 1360 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views