Chromium Code Reviews| Index: ui/views/view.cc |
| diff --git a/ui/views/view.cc b/ui/views/view.cc |
| index 290dfdafb8ae40e62332f425caeca4a5c6af9e02..0a9b8c767df9c620e280c799efb0bf982733de2a 100644 |
| --- a/ui/views/view.cc |
| +++ b/ui/views/view.cc |
| @@ -1030,6 +1030,14 @@ View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) { |
| return old_targeter.Pass(); |
| } |
| +ViewTargeter* View::GetEffectiveViewTargeter() const { |
| + ViewTargeter* view_targeter = targeter(); |
|
sadrul
2014/08/05 16:41:17
Do a DCHECK() here that GetWidget() is not null
tdanderson
2014/08/05 17:18:09
Done.
|
| + 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 +2278,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() { |