Chromium Code Reviews| Index: ui/views/view_targeter.h |
| diff --git a/ui/views/view_targeter.h b/ui/views/view_targeter.h |
| index ee4e7c3dcf1c6beddfca8cfa82aeaafa6975f4a3..90ccdc7158c54313e3a474f3fd380199a5ba4f7f 100644 |
| --- a/ui/views/view_targeter.h |
| +++ b/ui/views/view_targeter.h |
| @@ -26,12 +26,15 @@ class VIEWS_EXPORT ViewTargeter : public ui::EventTargeter { |
| // A call-through to TargetForRect() on |delegate_|. |
| View* TargetForRect(View* root, const gfx::Rect& rect) const; |
| - protected: |
| // ui::EventTargeter: |
| + // TODO(tdanderson): Make these private once RootView::DispatchGestureEvent() |
| + // has been removed. |
|
sadrul
2014/08/26 16:21:44
Maybe make RootView friend for the short-term inst
tdanderson
2014/08/26 20:21:14
Done.
|
| virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root, |
| ui::Event* event) OVERRIDE; |
| virtual ui::EventTarget* FindNextBestTarget(ui::EventTarget* previous_target, |
| ui::Event* event) OVERRIDE; |
| + protected: |
| + // ui::EventTargeter: |
| virtual bool SubtreeCanAcceptEvent( |
| ui::EventTarget* target, |
| const ui::LocatedEvent& event) const OVERRIDE; |
| @@ -42,6 +45,7 @@ class VIEWS_EXPORT ViewTargeter : public ui::EventTargeter { |
| private: |
| View* FindTargetForKeyEvent(View* root, const ui::KeyEvent& key); |
| View* FindTargetForScrollEvent(View* root, const ui::ScrollEvent& scroll); |
| + View* FindTargetForGestureEvent(View* root, const ui::GestureEvent& gesture); |
| // ViewTargeter does not own the |delegate_|, but |delegate_| must |
| // outlive the targeter. |