Renames IViewManagerClient::OnConnectionEstablished

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/stl_util.h"
 #include "mojo/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/services/view_manager/node.h"
@@ skipping 53 matching lines @@
       if (parent)
         parent->Remove(node);
       root_node_manager_->ProcessNodeDeleted(node_id);
       node_map_.erase(NodeIdToTransportId(node_id));
     }
   }
 
   root_node_manager_->RemoveConnection(this);
 }
 
-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;
-  GetUnknownNodesFrom(root_node_manager_->root(), &to_send);
-  AllocationScope allocation_scope;
-  client()->OnConnectionEstablished(
-      id_,
-      root_node_manager_->next_server_change_id(),
-      NodesToINodes(to_send));
-}
-
 const Node* ViewManagerConnection::GetNode(const NodeId& id) const {
   if (id_ == id.connection_id) {
     NodeMap::const_iterator i = node_map_.find(id.node_id);
     return i == node_map_.end() ? NULL : i->second;
   }
   return root_node_manager_->GetNode(id);
 }
 
 const View* ViewManagerConnection::GetView(const ViewId& id) const {
   if (id_ == id.connection_id) {
@@ skipping 320 matching lines @@
   }
   roots_.swap(roots);
 
   // TODO(sky): remove |known_nodes_.clear()| temporary while this is done here
   // instead of at creation time.
   known_nodes_.clear();
   std::vector<const Node*> to_send;
   for (NodeIdSet::const_iterator i = roots_.begin(); i != roots_.end(); ++i)
     GetUnknownNodesFrom(GetNode(NodeIdFromTransportId(*i)), &to_send);
   AllocationScope allocation_scope;
-  client()->OnConnectionEstablished(
+  client()->OnViewManagerConnectionEstablished(
       id_,
       root_node_manager_->next_server_change_id(),
       NodesToINodes(to_send));
 
   return true;
 }
 
 Array<INode> ViewManagerConnection::NodesToINodes(
     const std::vector<const Node*>& nodes) {
   Array<INode>::Builder array_builder(nodes.size());
@@ skipping 193 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::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;
+  GetUnknownNodesFrom(root_node_manager_->root(), &to_send);
+  AllocationScope allocation_scope;
+  client()->OnViewManagerConnectionEstablished(
+      id_,
+      root_node_manager_->next_server_change_id(),
+      NodesToINodes(to_send));
+}
+
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo