Pass ServiceProvider thru ViewManagerService::Embed() allowing embedder & embeddee to expose servic…

mojo/services/public/cpp/view_manager/lib/view_manager_client_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_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 42 matching lines @@
   bool OwnsNode(Id id) const;
   bool OwnsView(Id id) const;
 
   void SetActiveView(Id node_id, Id view_id);
   void SetBounds(Id node_id, const gfx::Rect& bounds);
   void SetViewContents(Id view_id, const SkBitmap& contents);
   void SetFocus(Id node_id);
   void SetVisible(Id node_id, bool visible);
 
   void Embed(const String& url, Id node_id);
+  void Embed(const String& url,
+             Id node_id,
+             ServiceProviderPtr service_provider);
 
   void set_change_acked_callback(const base::Callback<void(void)>& callback) {
     change_acked_callback_ = callback;
   }
   void ClearChangeAckedCallback() {
     change_acked_callback_ = base::Callback<void(void)>();
   }
 
   // Start/stop tracking nodes & views. While tracked, they can be retrieved via
   // ViewManager::GetNode/ViewById.
@@ skipping 17 matching lines @@
   virtual const std::vector<Node*>& GetRoots() const OVERRIDE;
   virtual Node* GetNodeById(Id id) OVERRIDE;
   virtual View* GetViewById(Id id) OVERRIDE;
 
   // Overridden from InterfaceImpl:
   virtual void OnConnectionEstablished() OVERRIDE;
 
   // Overridden from ViewManagerClient:
   virtual void OnEmbed(ConnectionSpecificId connection_id,
                        const String& creator_url,
-                       NodeDataPtr root) OVERRIDE;
+                       NodeDataPtr root,
+                       InterfaceRequest<ServiceProvider> services) OVERRIDE;
   virtual void OnNodeBoundsChanged(Id node_id,
                                    RectPtr old_bounds,
                                    RectPtr new_bounds) OVERRIDE;
   virtual void OnNodeHierarchyChanged(Id node_id,
                                       Id new_parent_id,
                                       Id old_parent_id,
                                       Array<NodeDataPtr> nodes) OVERRIDE;
   virtual void OnNodeReordered(Id node_id,
                                Id relative_node_id,
                                OrderDirection direction) OVERRIDE;
   virtual void OnNodeDeleted(Id node_id) OVERRIDE;
   virtual void OnNodeViewReplaced(Id node,
                                   Id new_view_id,
                                   Id old_view_id) OVERRIDE;
   virtual void OnViewDeleted(Id view_id) OVERRIDE;
   virtual void OnViewInputEvent(Id view,
                                 EventPtr event,
                                 const Callback<void()>& callback) OVERRIDE;
   virtual void OnFocusChanged(Id gained_focus_id, Id lost_focus_id) OVERRIDE;
-  virtual void Embed(const String& url) OVERRIDE;
+  virtual void Embed(
+      const String& url,
+      InterfaceRequest<ServiceProvider> service_provider) OVERRIDE;
   virtual void DispatchOnViewInputEvent(Id view_id, EventPtr event) OVERRIDE;
 
-  void AddRoot(Node* root);
   void RemoveRoot(Node* root);
 
   void OnActionCompleted(bool success);
   void OnActionCompletedWithErrorCode(ErrorCode code);
 
   base::Callback<void(bool)> ActionCompletedCallback();
   base::Callback<void(ErrorCode)> ActionCompletedCallbackWithErrorCode();
 
   bool connected_;
   ConnectionSpecificId connection_id_;
@@ skipping 12 matching lines @@
   IdToViewMap views_;
 
   ViewManagerService* service_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_