| Index: services/ui/ws/event_dispatcher.cc
|
| diff --git a/services/ui/ws/event_dispatcher.cc b/services/ui/ws/event_dispatcher.cc
|
| index c6e6897508347096389172210d6d3e9b91594479..56342211ce61b49ae3213181842baedea51d6cfa 100644
|
| --- a/services/ui/ws/event_dispatcher.cc
|
| +++ b/services/ui/ws/event_dispatcher.cc
|
| @@ -47,8 +47,7 @@ EventDispatcher::EventDispatcher(EventDispatcherDelegate* delegate)
|
| capture_window_client_id_(kInvalidClientId),
|
| modal_window_controller_(this),
|
| event_targeter_(
|
| - base::MakeUnique<EventTargeter>(delegate_,
|
| - &modal_window_controller_)),
|
| + base::MakeUnique<EventTargeter>(this, &modal_window_controller_)),
|
| mouse_button_down_(false),
|
| mouse_cursor_source_window_(nullptr),
|
| mouse_cursor_in_non_client_area_(false) {}
|
| @@ -317,6 +316,12 @@ void EventDispatcher::ProcessEvent(const ui::Event& event,
|
| return;
|
| }
|
|
|
| +ServerWindow* EventDispatcher::GetRootWindowContaining(
|
| + gfx::Point* location_in_display,
|
| + int64_t* display_id) {
|
| + return delegate_->GetRootWindowContaining(location_in_display, display_id);
|
| +}
|
| +
|
| void EventDispatcher::SetMouseCursorSourceWindow(ServerWindow* window) {
|
| if (mouse_cursor_source_window_ == window)
|
| return;
|
|
|