| Index: content/browser/frame_host/frame_mojo_shell.h
|
| diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h
|
| index dbb657b1b62310d59dbda5a27fb3f3ac8dcc26b3..ae66513d270f7a682b50425d83c8a2717371d71b 100644
|
| --- a/content/browser/frame_host/frame_mojo_shell.h
|
| +++ b/content/browser/frame_host/frame_mojo_shell.h
|
| @@ -31,8 +31,8 @@ class FrameMojoShell : public mojo::shell::mojom::Shell {
|
| // mojo::Shell:
|
| void ConnectToApplication(
|
| mojo::URLRequestPtr application_url,
|
| - mojo::InterfaceRequest<mojo::InterfaceProvider> services,
|
| - mojo::InterfaceProviderPtr exposed_services,
|
| + mojo::shell::mojom::InterfaceProviderRequest services,
|
| + mojo::shell::mojom::InterfaceProviderPtr exposed_services,
|
| mojo::shell::mojom::CapabilityFilterPtr filter,
|
| const ConnectToApplicationCallback& callback) override;
|
| void QuitApplication() override;
|
| @@ -44,7 +44,8 @@ class FrameMojoShell : public mojo::shell::mojom::Shell {
|
|
|
| // ServiceRegistry providing browser services to connected applications.
|
| scoped_ptr<ServiceRegistryImpl> service_registry_;
|
| - mojo::WeakBindingSet<mojo::InterfaceProvider> service_provider_bindings_;
|
| + mojo::WeakBindingSet<mojo::shell::mojom::InterfaceProvider>
|
| + service_provider_bindings_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FrameMojoShell);
|
| };
|
|
|