| Index: ui/views/view.cc
|
| diff --git a/ui/views/view.cc b/ui/views/view.cc
|
| index 290dfdafb8ae40e62332f425caeca4a5c6af9e02..349b0ddbcaa5d9b8ae97176ad97076c36e14eb01 100644
|
| --- a/ui/views/view.cc
|
| +++ b/ui/views/view.cc
|
| @@ -1030,6 +1030,15 @@ View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
|
| return old_targeter.Pass();
|
| }
|
|
|
| +ViewTargeter* View::GetEffectiveViewTargeter() const {
|
| + DCHECK(GetWidget());
|
| + ViewTargeter* view_targeter = targeter();
|
| + if (!view_targeter)
|
| + view_targeter = GetWidget()->GetRootView()->targeter();
|
| + CHECK(view_targeter);
|
| + return view_targeter;
|
| +}
|
| +
|
| bool View::CanAcceptEvent(const ui::Event& event) {
|
| return IsDrawn();
|
| }
|
| @@ -2270,14 +2279,6 @@ void View::ProcessMouseReleased(const ui::MouseEvent& event) {
|
| // WARNING: we may have been deleted.
|
| }
|
|
|
| -ViewTargeter* View::GetEffectiveViewTargeter() const {
|
| - ViewTargeter* view_targeter = targeter();
|
| - if (!view_targeter)
|
| - view_targeter = GetWidget()->GetRootView()->targeter();
|
| - CHECK(view_targeter);
|
| - return view_targeter;
|
| -}
|
| -
|
| // Accelerators ----------------------------------------------------------------
|
|
|
| void View::RegisterPendingAccelerators() {
|
|
|