Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1347)

Unified Diff: mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc

Issue 710203006: Reland: Remove aura and make a pure mojo::View version of FocusController. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Remove the offending lines. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..21e5f30ea99409fdc8c97c7391e118558676d51c 100644
--- a/mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc
+++ b/mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc
@@ -4,8 +4,8 @@
#include "mojo/services/window_manager/native_viewport_event_dispatcher_impl.h"
-#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 +17,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();
}

Powered by Google App Engine
This is Rietveld 408576698