Makes Embed() take a single node

mojo/services/view_manager/view_manager_service_impl.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_VIEW_MANAGER_SERVICE_IMPL_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 24 matching lines @@
 #pragma warning(disable : 4275)
 #endif
 
 // Manages a connection from the client.
 class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
     : public InterfaceImpl<ViewManagerService> {
  public:
   ViewManagerServiceImpl(RootNodeManager* root_node_manager,
                          ConnectionSpecificId creator_id,
                          const std::string& creator_url,
-                         const std::string& url);
+                         const std::string& url,
+                         const NodeId& root_id);
   virtual ~ViewManagerServiceImpl();
 
   // Used to mark this connection as originating from a call to
   // ViewManagerService::Connect(). When set OnConnectionError() deletes |this|.
   void set_delete_on_connection_error() { delete_on_connection_error_ = true; }
 
   ConnectionSpecificId id() const { return id_; }
   ConnectionSpecificId creator_id() const { return creator_id_; }
   const std::string& url() const { return url_; }
 
   // Returns the Node with the specified id.
   Node* GetNode(const NodeId& id) {
     return const_cast<Node*>(
         const_cast<const ViewManagerServiceImpl*>(this)->GetNode(id));
   }
   const Node* GetNode(const NodeId& id) const;
 
   // Returns the View with the specified id.
   View* GetView(const ViewId& id) {
     return const_cast<View*>(
         const_cast<const ViewManagerServiceImpl*>(this)->GetView(id));
   }
   const View* GetView(const ViewId& id) const;
 
-  void SetRoots(const Array<Id>& node_ids);
-
   // Invoked when a connection is destroyed.
   void OnViewManagerServiceImplDestroyed(ConnectionSpecificId id);
 
   // The following methods are invoked after the corresponding change has been
   // processed. They do the appropriate bookkeeping and update the client as
   // necessary.
   void ProcessNodeBoundsChanged(const Node* node,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds,
                                 bool originated_change);
@@ skipping 34 matching lines @@
   bool CanRemoveNodeFromParent(const Node* node) const;
   bool CanAddNode(const Node* parent, const Node* child) const;
   bool CanReorderNode(const Node* node,
                       const Node* relative_node,
                       OrderDirection direction) const;
   bool CanDeleteNode(const NodeId& node_id) const;
   bool CanDeleteView(const ViewId& view_id) const;
   bool CanSetView(const Node* node, const ViewId& view_id) const;
   bool CanSetFocus(const Node* node) const;
   bool CanGetNodeTree(const Node* node) const;
-  bool CanEmbed(const mojo::Array<uint32_t>& node_ids) const;
+  bool CanEmbed(Id transport_node_id) const;
   bool CanSetNodeVisibility(const Node* node, bool visible) const;
 
   // Deletes a node owned by this connection. Returns true on success. |source|
   // is the connection that originated the change.
   bool DeleteNodeImpl(ViewManagerServiceImpl* source, const NodeId& node_id);
 
   // Deletes a view owned by this connection. Returns true on success. |source|
   // is the connection that originated the change.
   bool DeleteViewImpl(ViewManagerServiceImpl* source, const ViewId& view_id);
 
   // Sets the view associated with a node.
   bool SetViewImpl(Node* node, const ViewId& view_id);
 
   // If |node| is known (in |known_nodes_|) does nothing. Otherwise adds |node|
   // to |nodes|, marks |node| as known and recurses.
   void GetUnknownNodesFrom(const Node* node, std::vector<const Node*>* nodes);
 
   // Removes |node| and all its descendants from |known_nodes_|. This does not
   // recurse through nodes that were created by this connection.
   void RemoveFromKnown(const Node* node);
 
-  // Adds |node_ids| to roots, returning true if at least one of the nodes was
-  // not already a root. If at least one of the nodes was not already a root
-  // the client is told of the new roots.
-  bool AddRoots(const std::vector<Id>& node_ids);
+  // Adds |transport_node_id| to the set of roots this connection knows about.
+  // Returns true if |transport_node_id| was not already a root for this
+  // connection.
+  bool AddRoot(Id transport_node_id);
 
   // Returns true if |node| is a non-null and a descendant of |roots_| (or
   // |roots_| is empty).
   bool IsNodeDescendantOfRoots(const Node* node) const;
 
   // Returns true if notification should be sent of a hierarchy change. If true
   // is returned, any nodes that need to be sent to the client are added to
   // |to_send|.
   bool ShouldNotifyOnHierarchyChange(const Node* node,
                                      const Node** new_parent,
                                      const Node** old_parent,
                                      std::vector<const Node*>* to_send);
 
   // Converts an array of Nodes to NodeDatas. This assumes all the nodes are
   // valid for the client. The parent of nodes the client is not allowed to see
   // are set to NULL (in the returned NodeDatas).
   Array<NodeDataPtr> NodesToNodeDatas(const std::vector<const Node*>& nodes);
 
-  // Overridden from ViewManagerService:
+  // ViewManagerService:
   virtual void CreateNode(Id transport_node_id,
                           const Callback<void(ErrorCode)>& callback) OVERRIDE;
   virtual void DeleteNode(Id transport_node_id,
                           Id server_change_id,
                           const Callback<void(bool)>& callback) OVERRIDE;
   virtual void AddNode(Id parent_id,
                        Id child_id,
                        Id server_change_id,
                        const Callback<void(bool)>& callback) OVERRIDE;
   virtual void RemoveNodeFromParent(
@@ skipping 21 matching lines @@
                                const Callback<void(bool)>& callback) OVERRIDE;
   virtual void SetFocus(Id node_id,
                         const Callback<void(bool)> & callback) OVERRIDE;
   virtual void SetNodeBounds(Id node_id,
                              RectPtr bounds,
                              const Callback<void(bool)>& callback) OVERRIDE;
   virtual void SetNodeVisibility(Id transport_node_id,
                                  bool visible,
                                  const Callback<void(bool)>& callback) OVERRIDE;
   virtual void Embed(const mojo::String& url,
-                     mojo::Array<uint32_t> node_ids,
+                     Id transport_node_id,
                      const mojo::Callback<void(bool)>& callback) OVERRIDE;
   virtual void DispatchOnViewInputEvent(Id transport_view_id,
                                         EventPtr event) OVERRIDE;
 
   // InterfaceImp overrides:
   virtual void OnConnectionEstablished() MOJO_OVERRIDE;
 
   RootNodeManager* root_node_manager_;
 
   // Id of this connection as assigned by RootNodeManager.
@@ skipping 33 matching lines @@
 
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_