Index: mojo/services/public/cpp/view_manager/view_manager.h |
diff --git a/mojo/services/public/cpp/view_manager/view_manager.h b/mojo/services/public/cpp/view_manager/view_manager.h |
index 4242bcca2e58bda5411c53a1ce4f32b4eeedb922..c2204a80ebadaa5cfbb1964cb8c95056b9fa9cc6 100644 |
--- a/mojo/services/public/cpp/view_manager/view_manager.h |
+++ b/mojo/services/public/cpp/view_manager/view_manager.h |
@@ -34,16 +34,16 @@ class ViewManager { |
const std::vector<ViewTreeNode*>& roots() { return roots_; } |
- ViewTreeNode* GetNodeById(TransportNodeId id); |
- View* GetViewById(TransportViewId id); |
+ ViewTreeNode* GetNodeById(Id id); |
+ View* GetViewById(Id id); |
private: |
friend class ViewManagerPrivate; |
friend class ViewManagerSynchronizer; |
- typedef std::map<TransportNodeId, ViewTreeNode*> IdToNodeMap; |
- typedef std::map<TransportViewId, View*> IdToViewMap; |
- typedef std::map<TransportConnectionId, |
+ typedef std::map<Id, ViewTreeNode*> IdToNodeMap; |
+ typedef std::map<Id, View*> IdToViewMap; |
+ typedef std::map<ConnectionSpecificId, |
ViewManagerSynchronizer*> SynchronizerMap; |
ViewManager(ViewManagerSynchronizer* synchronizer, |