Changes routing of input events in view manager

mojo/services/view_manager/view_manager_service_impl.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 "mojo/services/view_manager/view_manager_service_impl.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
@@ skipping 215 matching lines @@
   }
 }
 
 void ViewManagerServiceImpl::ProcessViewDeleted(const ViewId& view,
                                                 bool originated_change) {
   if (originated_change)
     return;
   client()->OnViewDeleted(ViewIdToTransportId(view));
 }
 
-void ViewManagerServiceImpl::ProcessViewInputEvent(const View* view,
-                                                   const ui::Event* event) {
-  DCHECK_EQ(id_, view->id().connection_id);
-  client()->OnViewInputEvent(
-      ViewIdToTransportId(view->id()),
-      TypeConverter<EventPtr, ui::Event>::ConvertFrom(*event),
-      base::Bind(&base::DoNothing));
-}
-
 void ViewManagerServiceImpl::OnConnectionError() {
   if (delete_on_connection_error_)
     delete this;
 }
 
 bool ViewManagerServiceImpl::CanRemoveNodeFromParent(const Node* node) const {
   if (!node)
     return false;
 
   const Node* parent = node->GetParent();
@@ skipping 491 matching lines @@
     ViewManagerServiceImpl* existing_connection =
         root_node_manager_->GetConnectionByCreator(id_, url.To<std::string>());
     if (existing_connection)
       success = existing_connection->AddRoots(node_ids.storage());
     else
       root_node_manager_->Embed(id_, url, node_ids);
   }
   callback.Run(success);
 }
 
+void ViewManagerServiceImpl::DispatchOnViewInputEvent(Id transport_view_id,
+                                                      EventPtr event) {
+  // We only allow the WM to dispatch events. At some point this function will
+  // move to a separate interface and the check can go away.
+  if (id_ != kWindowManagerConnection)
+    return;
+
+  const ViewId view_id(ViewIdFromTransportId(transport_view_id));
+  ViewManagerServiceImpl* connection = root_node_manager_->GetConnection(
+      view_id.connection_id);
+  if (connection)
+    connection->client()->OnViewInputEvent(
+        transport_view_id,
+        event.Pass(),
+        base::Bind(&base::DoNothing));
+}
+
 void ViewManagerServiceImpl::OnNodeHierarchyChanged(const Node* node,
                                                     const Node* new_parent,
                                                     const Node* old_parent) {
   root_node_manager_->ProcessNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
 void ViewManagerServiceImpl::OnNodeViewReplaced(const Node* node,
                                                 const View* new_view,
                                                 const View* old_view) {
   root_node_manager_->ProcessNodeViewReplaced(node, new_view, old_view);
 }
 
 void ViewManagerServiceImpl::OnViewInputEvent(const View* view,
                                               const ui::Event* event) {
-  ViewManagerServiceImpl* connection = root_node_manager_->GetConnection(
-      view->id().connection_id);
-  DCHECK(connection);
-  connection->ProcessViewInputEvent(view, event);
+  root_node_manager_->DispatchViewInputEventToWindowManager(view, event);
 }
 
 void ViewManagerServiceImpl::OnConnectionEstablished() {
   root_node_manager_->AddConnection(this);
 
   std::vector<const Node*> to_send;
   if (roots_.empty()) {
     GetUnknownNodesFrom(root_node_manager_->root(), &to_send);
   } else {
     for (NodeIdSet::const_iterator i = roots_.begin(); i != roots_.end(); ++i)
       GetUnknownNodesFrom(GetNode(NodeIdFromTransportId(*i)), &to_send);
   }
 
   client()->OnViewManagerConnectionEstablished(
       id_,
       creator_url_,
       root_node_manager_->next_server_change_id(),
       NodesToNodeDatas(to_send));
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo