Consolidates view_manager typedefs

mojo/services/view_manager/root_node_manager.h

 // 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.
 
 #ifndef MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 34 matching lines @@
   // Create when a ViewManagerConnection is about to make a change. Ensures
   // clients are notified of the correct change id.
   class ScopedChange {
    public:
     ScopedChange(ViewManagerConnection* connection,
                  RootNodeManager* root,
                  RootNodeManager::ChangeType change_type,
                  bool is_delete_node);
     ~ScopedChange();
 
-    TransportConnectionId connection_id() const { return connection_id_; }
+    ConnectionSpecificId connection_id() const { return connection_id_; }
     ChangeType change_type() const { return change_type_; }
     bool is_delete_node() const { return is_delete_node_; }
 
     // Marks the connection with the specified id as having seen a message.
-    void MarkConnectionAsMessaged(TransportConnectionId connection_id) {
+    void MarkConnectionAsMessaged(ConnectionSpecificId connection_id) {
       message_ids_.insert(connection_id);
     }
 
     // Returns true if MarkConnectionAsMessaged(connection_id) was invoked.
-    bool DidMessageConnection(TransportConnectionId connection_id) const {
+    bool DidMessageConnection(ConnectionSpecificId connection_id) const {
       return message_ids_.count(connection_id) > 0;
     }
 
    private:
     RootNodeManager* root_;
-    const TransportConnectionId connection_id_;
+    const ConnectionSpecificId connection_id_;
     const ChangeType change_type_;
     const bool is_delete_node_;
 
     // See description of MarkConnectionAsMessaged/DidMessageConnection.
-    std::set<TransportConnectionId> message_ids_;
+    std::set<ConnectionSpecificId> message_ids_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
   RootNodeManager(ServiceProvider* service_provider,
                   RootViewManagerDelegate* view_manager_delegate);
   virtual ~RootNodeManager();
 
   // Returns the id for the next ViewManagerConnection.
-  TransportConnectionId GetAndAdvanceNextConnectionId();
+  ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
-  TransportChangeId next_server_change_id() const {
+  Id next_server_change_id() const {
     return next_server_change_id_;
   }
 
   void AddConnection(ViewManagerConnection* connection);
   void RemoveConnection(ViewManagerConnection* connection);
 
   // Establishes the initial client. Similar to Connect(), but the resulting
   // client is allowed to do anything.
   void InitialConnect(const std::string& url);
 
   // See description of IViewManager::Connect() for details. This assumes
   // |node_ids| has been validated.
-  void Connect(TransportConnectionId creator_id,
+  void Connect(ConnectionSpecificId creator_id,
                const String& url,
-               const Array<TransportNodeId>& node_ids);
+               const Array<Id>& node_ids);
 
   // Returns the connection by id.
-  ViewManagerConnection* GetConnection(TransportConnectionId connection_id);
+  ViewManagerConnection* GetConnection(ConnectionSpecificId connection_id);
 
   // Returns the Node identified by |id|.
   Node* GetNode(const NodeId& id);
 
   // Returns the View identified by |id|.
   View* GetView(const ViewId& id);
 
   Node* root() { return &root_; }
 
   bool IsProcessingChange() const { return current_change_ != NULL; }
 
   bool is_processing_delete_node() const {
     return current_change_ && current_change_->is_delete_node(); }
 
   // Invoked when a connection messages a client about the change. This is used
   // to avoid sending ServerChangeIdAdvanced() unnecessarily.
-  void OnConnectionMessagedClient(TransportConnectionId id);
+  void OnConnectionMessagedClient(ConnectionSpecificId id);
 
   // Returns true if OnConnectionMessagedClient() was invoked for id.
-  bool DidConnectionMessageClient(TransportConnectionId id) const;
+  bool DidConnectionMessageClient(ConnectionSpecificId id) const;
 
   ViewManagerConnection* GetConnectionByCreator(
-      TransportConnectionId creator_id,
+      ConnectionSpecificId creator_id,
       const std::string& url) const;
 
   // These functions trivially delegate to all ViewManagerConnections, which in
   // term notify their clients.
   void ProcessNodeBoundsChanged(const Node* node,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void ProcessNodeHierarchyChanged(const Node* node,
                                    const Node* new_parent,
                                    const Node* old_parent);
   void ProcessNodeViewReplaced(const Node* node,
                                const View* new_view_id,
                                const View* old_view_id);
   void ProcessNodeDeleted(const NodeId& node);
   void ProcessViewDeleted(const ViewId& view);
 
  private:
   // Used to setup any static state needed by RootNodeManager.
   struct Context {
     Context();
     ~Context();
   };
 
-  typedef std::map<TransportConnectionId, ViewManagerConnection*> ConnectionMap;
+  typedef std::map<ConnectionSpecificId, ViewManagerConnection*> ConnectionMap;
 
   // Invoked when a connection is about to make a change.  Subsequently followed
   // by FinishChange() once the change is done.
   //
   // Changes should never nest, meaning each PrepareForChange() must be
   // balanced with a call to FinishChange() with no PrepareForChange()
   // in between.
   void PrepareForChange(ScopedChange* change);
 
   // Balances a call to PrepareForChange().
   void FinishChange();
 
   // Returns true if the specified connection originated the current change.
-  bool IsChangeSource(TransportConnectionId connection_id) const {
+  bool IsChangeSource(ConnectionSpecificId connection_id) const {
     return current_change_ && current_change_->connection_id() == connection_id;
   }
 
   // Implementation of the two connect variants.
-  ViewManagerConnection* ConnectImpl(TransportConnectionId creator_id,
+  ViewManagerConnection* ConnectImpl(ConnectionSpecificId creator_id,
                                      const String& url,
-                                     const Array<TransportNodeId>& node_ids);
+                                     const Array<Id>& node_ids);
 
   // Overridden from NodeDelegate:
   virtual void OnNodeHierarchyChanged(const Node* node,
                                       const Node* new_parent,
                                       const Node* old_parent) OVERRIDE;
   virtual void OnNodeViewReplaced(const Node* node,
                                   const View* new_view,
                                   const View* old_view) OVERRIDE;
   virtual void OnViewInputEvent(const View* view,
                                 const ui::Event* event) OVERRIDE;
 
   Context context_;
 
   ServiceProvider* service_provider_;
 
   // ID to use for next ViewManagerConnection.
-  TransportConnectionId next_connection_id_;
+  ConnectionSpecificId next_connection_id_;
 
-  TransportChangeId next_server_change_id_;
+  Id next_server_change_id_;
 
   // Set of ViewManagerConnections.
   ConnectionMap connection_map_;
 
   RootViewManager root_view_manager_;
 
   // Root node.
   Node root_;
 
   // Set of ViewManagerConnections created by way of Connect(). These have to be
   // explicitly destroyed.
   std::set<ViewManagerConnection*> connections_created_by_connect_;
 
   // If non-null we're processing a change. The ScopedChange is not owned by us
   // (it's created on the stack by ViewManagerConnection).
   ScopedChange* current_change_;
 
   DISALLOW_COPY_AND_ASSIGN(RootNodeManager);
 };
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_