View synchronization

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/services/view_manager/view_manager_connection.h"
 #include "ui/aura/env.h"
 
@@ skipping 62 matching lines @@
   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) {
+service::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) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->NotifyNodeHierarchyChanged(
@@ skipping 15 matching lines @@
 
 void RootNodeManager::NotifyNodeDeleted(const NodeId& node) {
   // TODO(sky): make a macro for this.
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->NotifyNodeDeleted(node, next_server_change_id_,
                                  GetClientChangeId(i->first));
   }
 }
 
+void RootNodeManager::NotifyViewDeleted(const ViewId& view) {
+  // TODO(sky): make a macro for this.
+  for (ConnectionMap::iterator i = connection_map_.begin();
+       i != connection_map_.end(); ++i) {
+    i->second->NotifyViewDeleted(view, next_server_change_id_,
+                                 GetClientChangeId(i->first));
+  }
+}
+
 void RootNodeManager::PrepareForChange(ViewManagerConnection* connection,
                                        TransportChangeId change_id) {
   DCHECK(!change_.get());  // Should only ever have one change in flight.
   change_.reset(new Change(connection->id(), change_id));
 }
 
 void RootNodeManager::FinishChange(ChangeType change_type) {
   DCHECK(change_.get());  // PrepareForChange/FinishChange should be balanced.
   change_.reset();
   if (change_type == CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID)
@@ skipping 15 matching lines @@
 
 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