Consolidates view_manager typedefs

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/view_manager/view.h"
 #include "mojo/services/view_manager/view_manager_connection.h"
@@ skipping 38 matching lines @@
       current_change_(NULL) {
 }
 
 RootNodeManager::~RootNodeManager() {
   while (!connections_created_by_connect_.empty())
     delete *(connections_created_by_connect_.begin());
   // All the connections should have been destroyed.
   DCHECK(connection_map_.empty());
 }
 
-TransportConnectionId RootNodeManager::GetAndAdvanceNextConnectionId() {
-  const TransportConnectionId id = next_connection_id_++;
+ConnectionSpecificId RootNodeManager::GetAndAdvanceNextConnectionId() {
+  const ConnectionSpecificId id = next_connection_id_++;
   DCHECK_LT(id, next_connection_id_);
   return id;
 }
 
 void RootNodeManager::AddConnection(ViewManagerConnection* connection) {
   DCHECK_EQ(0u, connection_map_.count(connection->id()));
   connection_map_[connection->id()] = connection;
 }
 
 void RootNodeManager::RemoveConnection(ViewManagerConnection* connection) {
   connection_map_.erase(connection->id());
   connections_created_by_connect_.erase(connection);
 
   // Notify remaining connections so that they can cleanup.
   for (ConnectionMap::const_iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->OnViewManagerConnectionDestroyed(connection->id());
   }
 }
 
 void RootNodeManager::InitialConnect(const std::string& url) {
   CHECK(connection_map_.empty());
-  Array<TransportNodeId> roots(0);
+  Array<Id> roots(0);
   ConnectImpl(kRootConnection, String::From(url), roots);
 }
 
-void RootNodeManager::Connect(TransportConnectionId creator_id,
+void RootNodeManager::Connect(ConnectionSpecificId creator_id,
                               const String& url,
-                              const Array<TransportNodeId>& node_ids) {
+                              const Array<Id>& node_ids) {
   CHECK_GT(node_ids.size(), 0u);
   ConnectImpl(creator_id, url, node_ids)->set_delete_on_connection_error();
 }
 
 ViewManagerConnection* RootNodeManager::GetConnection(
-    TransportConnectionId connection_id) {
+    ConnectionSpecificId connection_id) {
   ConnectionMap::iterator i = connection_map_.find(connection_id);
   return i == connection_map_.end() ? NULL : i->second;
 }
 
 Node* RootNodeManager::GetNode(const NodeId& id) {
   if (id == root_.id())
     return &root_;
   ConnectionMap::iterator i = connection_map_.find(id.connection_id);
   return i == connection_map_.end() ? NULL : i->second->GetNode(id);
 }
 
 View* RootNodeManager::GetView(const ViewId& id) {
   ConnectionMap::iterator i = connection_map_.find(id.connection_id);
   return i == connection_map_.end() ? NULL : i->second->GetView(id);
 }
 
-void RootNodeManager::OnConnectionMessagedClient(TransportConnectionId id) {
+void RootNodeManager::OnConnectionMessagedClient(ConnectionSpecificId id) {
   if (current_change_)
     current_change_->MarkConnectionAsMessaged(id);
 }
 
 bool RootNodeManager::DidConnectionMessageClient(
-    TransportConnectionId id) const {
+    ConnectionSpecificId id) const {
   return current_change_ && current_change_->DidMessageConnection(id);
 }
 
 ViewManagerConnection* RootNodeManager::GetConnectionByCreator(
-    TransportConnectionId creator_id,
+    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::ProcessNodeBoundsChanged(const Node* node,
@@ skipping 50 matching lines @@
 
 void RootNodeManager::FinishChange() {
   // PrepareForChange/FinishChange should be balanced.
   CHECK(current_change_);
   if (current_change_->change_type() == CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID)
     next_server_change_id_++;
   current_change_ = NULL;
 }
 
 ViewManagerConnection* RootNodeManager::ConnectImpl(
-    const TransportConnectionId creator_id,
+    const ConnectionSpecificId creator_id,
     const String& url,
-    const Array<TransportNodeId>& node_ids) {
+    const Array<Id>& node_ids) {
   MessagePipe pipe;
   service_provider_->ConnectToService(
       url,
       ViewManagerConnection::Client::Name_,
       pipe.handle1.Pass(),
       String());
   ViewManagerConnection* connection =
       new ViewManagerConnection(this, creator_id, url.To<std::string>());
   connection->SetRoots(node_ids);
   BindToPipe(connection, pipe.handle0.Pass());
@@ skipping 15 matching lines @@
 }
 
 void RootNodeManager::OnViewInputEvent(const View* view,
                                        const ui::Event* event) {
   GetConnection(view->id().connection_id)->ProcessViewInputEvent(view, event);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo