Revert of Mandoline: Remove native_viewport.mojom

components/view_manager/connection_manager.cc

Index: components/view_manager/connection_manager.cc
diff --git a/components/view_manager/connection_manager.cc b/components/view_manager/connection_manager.cc
index 1022048e972b2ff0bc7073034c5e2cc649fcd4e6..8555200ae8022c93a15f1359f5ab9cad82eb2f16 100644
--- a/components/view_manager/connection_manager.cc
+++ b/components/view_manager/connection_manager.cc
@@ -115,17 +115,20 @@
     : delegate_(delegate),
       window_manager_client_connection_(nullptr),
       next_connection_id_(1),
-      event_dispatcher_(this),
       display_manager_(display_manager.Pass()),
       root_(CreateServerView(RootViewId())),
       current_change_(nullptr),
       in_destructor_(false),
       animation_runner_(base::TimeTicks::Now()),
+      event_dispatcher_(this),
+      event_dispatcher_binding_(&event_dispatcher_),
       focus_controller_(new FocusController(this, root_.get())) {
   root_->SetBounds(gfx::Rect(800, 600));
   root_->SetVisible(true);
 
-  display_manager_->Init(this, &event_dispatcher_);
+  mojo::NativeViewportEventDispatcherPtr event_dispatcher_ptr;
+  event_dispatcher_binding_.Bind(GetProxy(&event_dispatcher_ptr));
+  display_manager_->Init(this, event_dispatcher_ptr.Pass());
 }
 
 ConnectionManager::~ConnectionManager() {
@@ -309,7 +312,7 @@
 }
 
 void ConnectionManager::ProcessEvent(mojo::EventPtr event) {
-  event_dispatcher_.OnEvent(event.Pass());
+  event_dispatcher_.OnEvent(event.Pass(), EventDispatcher::OnEventCallback());
 }
 
 void ConnectionManager::DispatchInputEventToView(const ServerView* view,