| Index: shell/application_manager/shell_impl.h
|
| diff --git a/shell/application_manager/shell_impl.h b/shell/application_manager/shell_impl.h
|
| index 0fa93ca6620e3739b320d45a4a433c010d68779c..d5dc681d68484ddf9582d6a7abd263f45c5f6b49 100644
|
| --- a/shell/application_manager/shell_impl.h
|
| +++ b/shell/application_manager/shell_impl.h
|
| @@ -9,6 +9,7 @@
|
| #include "base/macros.h"
|
| #include "mojo/common/binding_set.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| +#include "mojo/public/cpp/bindings/interface_handle.h"
|
| #include "mojo/public/interfaces/application/application.mojom.h"
|
| #include "mojo/public/interfaces/application/application_connector.mojom.h"
|
| #include "mojo/public/interfaces/application/shell.mojom.h"
|
| @@ -35,10 +36,11 @@ class ShellImpl : public mojo::Shell {
|
|
|
| void InitializeApplication(mojo::Array<mojo::String> args);
|
|
|
| - void ConnectToClient(const GURL& requested_url,
|
| - const GURL& requestor_url,
|
| - mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| - mojo::ServiceProviderPtr exposed_services);
|
| + void ConnectToClient(
|
| + const GURL& requested_url,
|
| + const GURL& requestor_url,
|
| + mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| + mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services);
|
|
|
| mojo::Application* application() { return application_.get(); }
|
| const Identity& identity() const { return identity_; }
|
| @@ -54,7 +56,7 @@ class ShellImpl : public mojo::Shell {
|
| void ConnectToApplication(
|
| const mojo::String& app_url,
|
| mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| - mojo::ServiceProviderPtr exposed_services) override;
|
| + mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) override;
|
| void Duplicate(mojo::InterfaceRequest<mojo::ApplicationConnector>
|
| application_connector_request) override;
|
|
|
| @@ -69,7 +71,7 @@ class ShellImpl : public mojo::Shell {
|
| void ConnectToApplication(
|
| const mojo::String& app_url,
|
| mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| - mojo::ServiceProviderPtr exposed_services) override;
|
| + mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) override;
|
| void CreateApplicationConnector(
|
| mojo::InterfaceRequest<mojo::ApplicationConnector>
|
| application_connector_request) override;
|
|
|