Do not call into EventTargeter methods from ViewTargeter

ui/views/view_targeter.h

 // Copyright 2014 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.
 
 #ifndef UI_VIEWS_VIEW_TARGETER_H_
 #define UI_VIEWS_VIEW_TARGETER_H_
 
 #include "ui/events/event_targeter.h"
 #include "ui/views/views_export.h"
 
 namespace views {
 
 class View;
 class ViewTargeterDelegate;
 
-// Contains the logic used to determine the View to which an
-// event should be dispatched. A ViewTargeter (or one of its
-// derived classes) is installed on a View to specify the
-// targeting behaviour to be used for the subtree rooted at
-// that View.
-// TODO(tdanderson): Remove overrides of all EventHandler methods except for
-//                   FindTargetForEvent() and FindNextBestTarget().
+// A ViewTargeter is installed on a derived class of View that wishes to use

[sadrul, 2014/07/29 18:06:50]

's/derived class of//'

You should be able to install it on any View, right?

[tdanderson, 2014/07/29 19:40:45]

Yep, this was careless wording on my part. Fixed.

+// the custom hit-testing or event-targeting behaviour defined by |delegate|.
 class VIEWS_EXPORT ViewTargeter : public ui::EventTargeter {
  public:
   explicit ViewTargeter(ViewTargeterDelegate* delegate);
   virtual ~ViewTargeter();
 
   // A call-through to DoesIntersectRect() on |delegate_|.
   bool DoesIntersectRect(const View* target, const gfx::Rect& rect) const;
 
   // A call-through to TargetForRect() on |delegate_|.
   View* TargetForRect(View* root, const gfx::Rect& rect) const;
 
  protected:
-  // Returns the location of |event| represented as a rect. If |event| is
-  // a gesture event, its bounding box is returned. Otherwise, a 1x1 rect
-  // having its origin at the location of |event| is returned.
-  gfx::RectF BoundsForEvent(const ui::LocatedEvent& event) const;
-
   // ui::EventTargeter:
   virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root,
                                               ui::Event* event) OVERRIDE;
   virtual ui::EventTarget* FindNextBestTarget(ui::EventTarget* previous_target,
                                               ui::Event* event) OVERRIDE;
-  virtual bool SubtreeCanAcceptEvent(

[sadrul, 2014/07/29 18:06:50]

How about keeping these with NOTREACHED()?

[tdanderson, 2014/07/29 19:40:45]

Sure, seems reasonable. We can remove them entirely when crbug.com/395388 is
addressed.

-      ui::EventTarget* target,
-      const ui::LocatedEvent& event) const OVERRIDE;
-  virtual bool EventLocationInsideBounds(
-      ui::EventTarget* target,
-      const ui::LocatedEvent& event) const OVERRIDE;
 
  private:
-  View* FindTargetForKeyEvent(View* view, const ui::KeyEvent& key);
+  View* FindTargetForKeyEvent(View* root, const ui::KeyEvent& key);
+  View* FindTargetForScrollEvent(View* root, const ui::ScrollEvent& scroll);
 
   // ViewTargeter does not own the |delegate_|, but |delegate_| must
   // outlive the targeter.
   ViewTargeterDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewTargeter);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_VIEW_TARGETER_H_