| Index: components/view_manager/public/cpp/lib/view_manager_context.cc
|
| diff --git a/components/view_manager/public/cpp/lib/view_manager_context.cc b/components/view_manager/public/cpp/lib/view_manager_context.cc
|
| index 1eaffae1f09495d79b17e42bb6ea05a8a6a5de67..c7a8e3d9037f70542ada74029cfbf3c2a8af17f1 100644
|
| --- a/components/view_manager/public/cpp/lib/view_manager_context.cc
|
| +++ b/components/view_manager/public/cpp/lib/view_manager_context.cc
|
| @@ -13,7 +13,9 @@ class ApplicationImpl;
|
| class ViewManagerContext::InternalState {
|
| public:
|
| explicit InternalState(ApplicationImpl* application_impl) {
|
| - application_impl->ConnectToService("mojo:window_manager", &wm_);
|
| + mojo::URLRequestPtr request(mojo::URLRequest::New());
|
| + request->url = mojo::String::From("mojo:window_manager");
|
| + application_impl->ConnectToService(request.Pass(), &wm_);
|
| }
|
| ~InternalState() {}
|
|
|
| @@ -32,13 +34,15 @@ ViewManagerContext::~ViewManagerContext() {
|
| }
|
|
|
| void ViewManagerContext::Embed(const String& url) {
|
| - Embed(url, nullptr, nullptr);
|
| + mojo::URLRequestPtr request(mojo::URLRequest::New());
|
| + request->url = mojo::String::From(url);
|
| + Embed(request.Pass(), nullptr, nullptr);
|
| }
|
|
|
| -void ViewManagerContext::Embed(const String& url,
|
| +void ViewManagerContext::Embed(mojo::URLRequestPtr request,
|
| InterfaceRequest<ServiceProvider> services,
|
| ServiceProviderPtr exposed_services) {
|
| - state_->wm()->Embed(url, services.Pass(), exposed_services.Pass());
|
| + state_->wm()->Embed(request.Pass(), services.Pass(), exposed_services.Pass());
|
| }
|
|
|
| } // namespace mojo
|
|
|