| Index: ui/aura/window.cc
|
| diff --git a/ui/aura/window.cc b/ui/aura/window.cc
|
| index 91df99eefcdfb8dbd07b9f66e5522c71b069a59a..4b26c57a6bce79b34804413daee9851278cd8fa4 100644
|
| --- a/ui/aura/window.cc
|
| +++ b/ui/aura/window.cc
|
| @@ -805,6 +805,10 @@ void Window::OnDeviceScaleFactorChanged(float device_scale_factor) {
|
| delegate_->OnDeviceScaleFactorChanged(device_scale_factor);
|
| }
|
|
|
| +ui::EventTargeter* Window::GetEventTargeter() {
|
| + return targeter_.get();
|
| +}
|
| +
|
| #if !defined(NDEBUG)
|
| std::string Window::GetDebugInfo() const {
|
| return base::StringPrintf(
|
| @@ -1429,10 +1433,6 @@ scoped_ptr<ui::EventTargetIterator> Window::GetChildIterator() const {
|
| return make_scoped_ptr(new ui::EventTargetIteratorImpl<Window>(children()));
|
| }
|
|
|
| -ui::EventTargeter* Window::GetEventTargeter() {
|
| - return targeter_.get();
|
| -}
|
| -
|
| void Window::ConvertEventToTarget(ui::EventTarget* target,
|
| ui::LocatedEvent* event) {
|
| event->ConvertLocationToTarget(this,
|
|
|