Change type of interface created by mojo:view_manager

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>
 
 #include "base/basictypes.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/node_delegate.h"
 #include "mojo/services/view_manager/root_view_manager.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
 
 class ServiceProvider;
 
 namespace view_manager {
 namespace service {
 
+class RootViewManagerDelegate;
 class View;
 class ViewManagerConnection;
 
 // RootNodeManager is responsible for managing the set of ViewManagerConnections
 // as well as providing the root of the node hierarchy.
 class MOJO_VIEW_MANAGER_EXPORT RootNodeManager : public NodeDelegate {
  public:
   // Used to indicate if the server id should be incremented after notifiying
   // clients of the change.
   enum ChangeType {
@@ skipping 11 matching lines @@
                  bool is_delete_node);
     ~ScopedChange();
 
    private:
     RootNodeManager* root_;
     const ChangeType change_type_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
-  explicit RootNodeManager(ServiceProvider* service_provider);
+  RootNodeManager(ServiceProvider* service_provider,
+                  RootViewManagerDelegate* view_manager_delegate);
   virtual ~RootNodeManager();
 
   // Returns the id for the next ViewManagerConnection.
   TransportConnectionId GetAndAdvanceNextConnectionId();
 
   TransportChangeId 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(const String& url, const Array<TransportNodeId>& node_ids);
 
   // Returns the connection by id.
   ViewManagerConnection* GetConnection(TransportConnectionId connection_id);
 
   // Returns the Node identified by |id|.
   Node* GetNode(const NodeId& id);
 
   // Returns the View identified by |id|.
   View* GetView(const ViewId& id);
@@ skipping 36 matching lines @@
   void PrepareForChange(ViewManagerConnection* connection, bool is_delete_node);
 
   // Balances a call to PrepareForChange().
   void FinishChange(ChangeType change_type);
 
   // Returns true if the specified connection originated the current change.
   bool IsChangeSource(TransportConnectionId connection_id) const {
     return connection_id == change_source_;
   }
 
+  // Implementation of the two connect variants.
+  ViewManagerConnection* ConnectImpl(const String& url,
+                                     const Array<TransportNodeId>& 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;
 
   Context context_;
 
@@ skipping 23 matching lines @@
   std::set<ViewManagerConnection*> connections_created_by_connect_;
 
   DISALLOW_COPY_AND_ASSIGN(RootNodeManager);
 };
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_