| Index: content/browser/frame_host/frame_mojo_shell.cc
|
| diff --git a/content/browser/frame_host/frame_mojo_shell.cc b/content/browser/frame_host/frame_mojo_shell.cc
|
| index c2304032e3f323b43769670d5bd20b24b4da72e3..91a3875974174b6a2eabcd1b3eb69c78f7c5645e 100644
|
| --- a/content/browser/frame_host/frame_mojo_shell.cc
|
| +++ b/content/browser/frame_host/frame_mojo_shell.cc
|
| @@ -32,7 +32,8 @@ void FrameMojoShell::ConnectToApplication(
|
| mojo::URLRequestPtr application_url,
|
| mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| mojo::ServiceProviderPtr /* exposed_services */,
|
| - mojo::CapabilityFilterPtr filter) {
|
| + mojo::CapabilityFilterPtr filter,
|
| + const ConnectToApplicationCallback& callback) {
|
| mojo::ServiceProviderPtr frame_services;
|
| service_provider_bindings_.AddBinding(GetServiceRegistry(),
|
| GetProxy(&frame_services));
|
| @@ -43,7 +44,7 @@ void FrameMojoShell::ConnectToApplication(
|
| capability_filter = filter->filter.To<mojo::shell::CapabilityFilter>();
|
| MojoShellContext::ConnectToApplication(
|
| GURL(application_url->url), frame_host_->GetSiteInstance()->GetSiteURL(),
|
| - services.Pass(), frame_services.Pass(), capability_filter);
|
| + services.Pass(), frame_services.Pass(), capability_filter, callback);
|
| }
|
|
|
| void FrameMojoShell::QuitApplication() {
|
|
|