| Index: mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc
|
| diff --git a/mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc b/mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc
|
| index 30764b402d32daca7d36bfb0620ae4e4eb26eb4c..32eb8f54be78de2593dc43533032e12459df5fd3 100644
|
| --- a/mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc
|
| +++ b/mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "mojo/aura/window_tree_host_mojo.h"
|
| #include "mojo/converters/input_events/input_events_type_converters.h"
|
| +#include "mojo/services/window_manager/view_event_dispatcher.h"
|
| #include "mojo/services/window_manager/window_manager_app.h"
|
|
|
| namespace mojo {
|
| @@ -17,12 +18,18 @@ NativeViewportEventDispatcherImpl::NativeViewportEventDispatcherImpl(
|
| NativeViewportEventDispatcherImpl::~NativeViewportEventDispatcherImpl() {
|
| }
|
|
|
| +ui::EventProcessor* NativeViewportEventDispatcherImpl::GetEventProcessor() {
|
| + return app_->event_dispatcher();
|
| +}
|
| +
|
| void NativeViewportEventDispatcherImpl::OnEvent(
|
| mojo::EventPtr event,
|
| const mojo::Callback<void()>& callback) {
|
| scoped_ptr<ui::Event> ui_event = event.To<scoped_ptr<ui::Event>>();
|
| +
|
| if (ui_event)
|
| - app_->host()->SendEventToProcessor(ui_event.get());
|
| + SendEventToProcessor(ui_event.get());
|
| +
|
| callback.Run();
|
| }
|
|
|
|
|