| Index: trunk/src/mojo/services/view_manager/root_node_manager.cc
|
| ===================================================================
|
| --- trunk/src/mojo/services/view_manager/root_node_manager.cc (revision 266161)
|
| +++ trunk/src/mojo/services/view_manager/root_node_manager.cc (working copy)
|
| @@ -51,11 +51,6 @@
|
| connection_map_.erase(connection->id());
|
| }
|
|
|
| -ViewManagerConnection* RootNodeManager::GetConnection(uint16_t 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_;
|
| @@ -63,11 +58,6 @@
|
| 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::NotifyNodeHierarchyChanged(const NodeId& node,
|
| const NodeId& new_parent,
|
| const NodeId& old_parent) {
|
| @@ -80,19 +70,6 @@
|
| }
|
| }
|
|
|
| -void RootNodeManager::NotifyNodeViewReplaced(const NodeId& node,
|
| - const ViewId& new_view_id,
|
| - const ViewId& old_view_id) {
|
| - // TODO(sky): make a macro for this.
|
| - for (ConnectionMap::iterator i = connection_map_.begin();
|
| - i != connection_map_.end(); ++i) {
|
| - const int32_t change_id = (change_ && i->first == change_->connection_id) ?
|
| - change_->change_id : 0;
|
| - i->second->NotifyNodeViewReplaced(node, new_view_id, old_view_id,
|
| - change_id);
|
| - }
|
| -}
|
| -
|
| void RootNodeManager::PrepareForChange(ViewManagerConnection* connection,
|
| int32_t change_id) {
|
| DCHECK(!change_.get()); // Should only ever have one change in flight.
|
| @@ -124,12 +101,6 @@
|
| NotifyNodeHierarchyChanged(node, new_parent, old_parent);
|
| }
|
|
|
| -void RootNodeManager::OnNodeViewReplaced(const NodeId& node,
|
| - const ViewId& new_view_id,
|
| - const ViewId& old_view_id) {
|
| - NotifyNodeViewReplaced(node, new_view_id, old_view_id);
|
| -}
|
| -
|
| } // namespace view_manager
|
| } // namespace services
|
| } // namespace mojo
|
|
|