Removes ServiceProviders from ViewManager::Embed

components/view_manager/public/cpp/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 COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 #define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 
 #include "components/view_manager/public/cpp/types.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager.h"
@@ skipping 65 matching lines @@
   bool is_embed_root() const { return is_embed_root_; }
 
  private:
   class RootObserver;
 
   typedef std::map<Id, View*> IdToViewMap;
 
   Id CreateViewOnServer();
 
   // Overridden from ViewManager:
-  const std::string& GetEmbedderURL() const override;
   View* GetRoot() override;
   View* GetViewById(Id id) override;
   View* GetFocusedView() override;
   View* CreateView() override;
   void SetEmbedRoot() override;
 
   // Overridden from ViewManagerClient:
   void OnEmbed(ConnectionSpecificId connection_id,
-               const String& creator_url,
                ViewDataPtr root,
                ViewManagerServicePtr view_manager_service,
-               InterfaceRequest<ServiceProvider> services,
-               ServiceProviderPtr exposed_services,
                Id focused_view_id) override;
-  void OnWillEmbed(Id view,
-                   InterfaceRequest<ServiceProvider> services,
-                   ServiceProviderPtr exposed_services,
-                   const OnWillEmbedCallback& callback) override;
+  void OnEmbedForDescendant(
+      Id view,
+      mojo::URLRequestPtr request,
+      const OnEmbedForDescendantCallback& callback) override;
   void OnEmbeddedAppDisconnected(Id view_id) override;
   void OnViewBoundsChanged(Id view_id,
                            RectPtr old_bounds,
                            RectPtr new_bounds) override;
   void OnViewViewportMetricsChanged(ViewportMetricsPtr old_metrics,
                                     ViewportMetricsPtr new_metrics) override;
   void OnViewHierarchyChanged(Id view_id,
                               Id new_parent_id,
                               Id old_parent_id,
                               Array<ViewDataPtr> views) override;
@@ skipping 16 matching lines @@
 
   void RootDestroyed(View* root);
 
   void OnActionCompleted(bool success);
 
   Callback<void(bool)> ActionCompletedCallback();
 
   ConnectionSpecificId connection_id_;
   ConnectionSpecificId next_id_;
 
-  std::string creator_url_;
-
   Callback<void(void)> change_acked_callback_;
 
   ViewManagerDelegate* delegate_;
 
   View* root_;
 
   IdToViewMap views_;
 
   View* capture_view_;
   View* focused_view_;
   View* activated_view_;
 
   Binding<ViewManagerClient> binding_;
   ViewManagerServicePtr service_;
 
   scoped_ptr<RootObserver> root_observer_;
 
   bool is_embed_root_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 }  // namespace mojo
 
 #endif  // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_