| Index: ui/views/view.h
|
| diff --git a/ui/views/view.h b/ui/views/view.h
|
| index 38d99281061e5546f95859162abb76f265ea28bf..858fde3ac699d3e5ebe457efff1245bdfc05fda9 100644
|
| --- a/ui/views/view.h
|
| +++ b/ui/views/view.h
|
| @@ -704,6 +704,13 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
| // ViewTargeter.
|
| scoped_ptr<ViewTargeter> SetEventTargeter(scoped_ptr<ViewTargeter> targeter);
|
|
|
| + // Returns the ViewTargeter installed on |this| if one exists,
|
| + // otherwise returns the ViewTargeter installed on our root view.
|
| + // The return value is guaranteed to be non-null.
|
| + ViewTargeter* GetEffectiveViewTargeter() const;
|
| +
|
| + ViewTargeter* targeter() const { return targeter_.get(); }
|
| +
|
| // Overridden from ui::EventTarget:
|
| virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
|
| virtual ui::EventTarget* GetParentTarget() OVERRIDE;
|
| @@ -712,8 +719,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
| virtual void ConvertEventToTarget(ui::EventTarget* target,
|
| ui::LocatedEvent* event) OVERRIDE;
|
|
|
| - ViewTargeter* targeter() const { return targeter_.get(); }
|
| -
|
| // Overridden from ui::EventHandler:
|
| virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
| @@ -1390,11 +1395,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
| bool ProcessMouseDragged(const ui::MouseEvent& event);
|
| void ProcessMouseReleased(const ui::MouseEvent& event);
|
|
|
| - // Returns the ViewTargeter installed on |this| if one exists,
|
| - // otherwise returns the ViewTargeter installed on our root view.
|
| - // The return value is guaranteed to be non-null.
|
| - ViewTargeter* GetEffectiveViewTargeter() const;
|
| -
|
| // Accelerators --------------------------------------------------------------
|
|
|
| // Registers this view's keyboard accelerators that are not registered to
|
|
|