Revert 273723 "Wire input events through the ViewManagerClient i..."

trunk/src/mojo/services/view_manager/view_manager_connection.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_connection.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"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/view.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
@@ skipping 143 matching lines @@
   if (originated_change || !known_nodes_.count(NodeIdToTransportId(node->id())))
     return;
   const TransportViewId new_view_id = new_view ?
       ViewIdToTransportId(new_view->id()) : 0;
   const TransportViewId old_view_id = old_view ?
       ViewIdToTransportId(old_view->id()) : 0;
   client()->OnNodeViewReplaced(NodeIdToTransportId(node->id()),
                                new_view_id, old_view_id);
 }
 
-void ViewManagerConnection::ProcessViewInputEvent(const View* view,
-                                                  const ui::Event* event) {
-  const TransportViewId view_id = ViewIdToTransportId(view->id());
-  if (view->id().connection_id != id_)
-    return;
-  client()->OnViewInputEvent(
-      view_id,
-      TypeConverter<EventPtr, ui::Event>::ConvertFrom(*event),
-      base::Bind(&base::DoNothing));
-}
-
 void ViewManagerConnection::ProcessNodeDeleted(
     const NodeId& node,
     TransportChangeId server_change_id,
     bool originated_change) {
   const bool in_known = known_nodes_.erase(NodeIdToTransportId(node)) > 0;
   const bool in_roots = roots_.erase(NodeIdToTransportId(node)) > 0;
 
   if (in_roots && roots_.empty())
     roots_.insert(NodeIdToTransportId(InvalidNodeId()));
 
@@ skipping 424 matching lines @@
                                                    const Node* old_parent) {
   root_node_manager_->ProcessNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
 void ViewManagerConnection::OnNodeViewReplaced(const Node* node,
                                                const View* new_view,
                                                const View* old_view) {
   root_node_manager_->ProcessNodeViewReplaced(node, new_view, old_view);
 }
 
-void ViewManagerConnection::OnViewInputEvent(const View* view,
-                                             const ui::Event* event) {
-  root_node_manager_->ProcessViewInputEvent(view, event);
-}
-
 void ViewManagerConnection::OnConnectionEstablished() {
   DCHECK_EQ(0, id_);  // Should only get OnConnectionEstablished() once.
 
   id_ = root_node_manager_->GetAndAdvanceNextConnectionId();
 
   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_,
       root_node_manager_->next_server_change_id(),
       NodesToINodes(to_send));
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo