Changes routing of input events in view manager

mojo/services/view_manager/root_node_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 "mojo/services/view_manager/root_node_manager.h"
 
 #include "base/logging.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/view_manager/view.h"
 #include "mojo/services/view_manager/view_manager_service_impl.h"
 #include "ui/aura/env.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 RootNodeManager::ScopedChange::ScopedChange(
     ViewManagerServiceImpl* connection,
@@ skipping 104 matching lines @@
     ConnectionSpecificId creator_id,
     const std::string& url) const {
   for (ConnectionMap::const_iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     if (i->second->creator_id() == creator_id && i->second->url() == url)
       return i->second;
   }
   return NULL;
 }
 
+void RootNodeManager::DispatchViewInputEventToWindowManager(
+    const View* view,
+    const ui::Event* event) {
+  // Input events are forwarded to the WindowManager. The WindowManager
+  // eventually calls back to us with DispatchOnViewInputEvent().
+  ViewManagerServiceImpl* connection = GetConnection(kWindowManagerConnection);
+  if (!connection)
+    return;
+  connection->client()->DispatchOnViewInputEvent(
+      ViewIdToTransportId(view->id()),
+      TypeConverter<EventPtr, ui::Event>::ConvertFrom(*event));
+}
+
 void RootNodeManager::ProcessNodeBoundsChanged(const Node* node,
                                                const gfx::Rect& old_bounds,
                                                const gfx::Rect& new_bounds) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeBoundsChanged(node, old_bounds, new_bounds,
                                         IsChangeSource(i->first));
   }
 }
 
@@ skipping 93 matching lines @@
 }
 
 void RootNodeManager::OnNodeViewReplaced(const Node* node,
                                          const View* new_view,
                                          const View* old_view) {
   ProcessNodeViewReplaced(node, new_view, old_view);
 }
 
 void RootNodeManager::OnViewInputEvent(const View* view,
                                        const ui::Event* event) {
-  GetConnection(view->id().connection_id)->ProcessViewInputEvent(view, event);
+  DispatchViewInputEventToWindowManager(view, event);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo