Revert of Mandoline: Remove native_viewport.mojom

components/view_manager/connection_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/view_manager/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager_delegate.h"
@@ skipping 97 matching lines @@
 
 ConnectionManager::ScopedChange::~ScopedChange() {
   connection_manager_->FinishChange();
 }
 
 ConnectionManager::ConnectionManager(ConnectionManagerDelegate* delegate,
                                      scoped_ptr<DisplayManager> display_manager)
     : 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() {
   in_destructor_ = true;
 
   // Deleting views will attempt to advance focus. When we're being destroyed
   // that is not necessary. Additionally |focus_controller_| needs to be
   // destroyed before |root_|.
   focus_controller_.reset();
 
@@ skipping 163 matching lines @@
                            this, &ConnectionManager::DoAnimation);
   }
   ServerView* clone = CloneView(view, this);
   CloneViewTree(view, clone, this);
   view->parent()->Add(clone);
   view->parent()->Reorder(clone, view, mojo::ORDER_DIRECTION_ABOVE);
   return true;
 }
 
 void ConnectionManager::ProcessEvent(mojo::EventPtr event) {
-  event_dispatcher_.OnEvent(event.Pass());
+  event_dispatcher_.OnEvent(event.Pass(), EventDispatcher::OnEventCallback());
 }
 
 void ConnectionManager::DispatchInputEventToView(const ServerView* view,
                                                  mojo::EventPtr event) {
   // If the view is an embed root, forward to the embedded view, not the owner.
   ViewManagerServiceImpl* connection = GetConnectionWithRoot(view->id());
   if (!connection)
     connection = GetConnection(view->id().connection_id);
   CHECK(connection);
   connection->client()->OnViewInputEvent(ViewIdToTransportId(view->id()),
@@ skipping 289 matching lines @@
     if (wm_connection != owning_connection_old &&
         wm_connection != embedded_connection_old &&
         wm_connection != owning_connection_new &&
         wm_connection != embedded_connection_new) {
       wm_connection->ProcessFocusChanged(old_focused_view, new_focused_view);
     }
   }
 }
 
 }  // namespace view_manager