| Index: mojo/services/view_manager/public/cpp/view_manager_context.h
|
| diff --git a/mojo/services/view_manager/public/cpp/view_manager_context.h b/mojo/services/view_manager/public/cpp/view_manager_context.h
|
| index ed8f23e7b16789e4194ecb3360380392a4540c1d..197659885c0aa968090b426cc33cd1a07fd1e0f1 100644
|
| --- a/mojo/services/view_manager/public/cpp/view_manager_context.h
|
| +++ b/mojo/services/view_manager/public/cpp/view_manager_context.h
|
| @@ -26,14 +26,14 @@ class ViewManagerContext {
|
| // Subsequent times, the implementation of this method is delegated to the
|
| // application embedded at the service root View. This application will have a
|
| // specific definition of where within its View hierarchy to embed an
|
| - // un-parented URL. |exported_services| encapsulates services offered by the
|
| - // application calling Embed() to the application being embedded. Returns
|
| - // an object implementing ServiceProvider encapsulating services offered by
|
| - // the embedded application to the embedder.
|
| + // un-parented URL.
|
| + // |services| encapsulates services offered by the embedder to the embedded
|
| + // app alongside this Embed() call. |exposed_services| provides a means for
|
| + // the embedder to connect to services exposed by the embedded app.
|
| void Embed(const String& url);
|
| - scoped_ptr<ServiceProvider> Embed(
|
| - const String& url,
|
| - scoped_ptr<ServiceProviderImpl> exported_services);
|
| + void Embed(const String& url,
|
| + InterfaceRequest<ServiceProvider> services,
|
| + ServiceProviderPtr exposed_Services);
|
|
|
| private:
|
| class InternalState;
|
|
|