| Index: components/resource_provider/resource_provider_app.h
|
| diff --git a/components/resource_provider/resource_provider_app.h b/components/resource_provider/resource_provider_app.h
|
| index 8831e6c4ca5d38f9a87a3eb13356a07a42b646f1..2d1dd4d5a6aa34dd1d180578fa84b77cb36d34fc 100644
|
| --- a/components/resource_provider/resource_provider_app.h
|
| +++ b/components/resource_provider/resource_provider_app.h
|
| @@ -12,8 +12,8 @@
|
| #include "mojo/common/weak_binding_set.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| #include "mojo/services/tracing/public/cpp/tracing_impl.h"
|
| -#include "mojo/shell/public/cpp/application_delegate.h"
|
| #include "mojo/shell/public/cpp/interface_factory.h"
|
| +#include "mojo/shell/public/cpp/shell_client.h"
|
|
|
| namespace mojo {
|
| class Shell;
|
| @@ -21,21 +21,20 @@ class Shell;
|
|
|
| namespace resource_provider {
|
|
|
| -class ResourceProviderApp : public mojo::ApplicationDelegate,
|
| +class ResourceProviderApp : public mojo::ShellClient,
|
| public mojo::InterfaceFactory<ResourceProvider> {
|
| public:
|
| explicit ResourceProviderApp(const std::string& resource_provider_app_url);
|
| ~ResourceProviderApp() override;
|
|
|
| private:
|
| - // ApplicationDelegate:
|
| + // mojo::ShellClient:
|
| void Initialize(mojo::Shell* shell, const std::string& url,
|
| uint32_t id) override;
|
| - bool AcceptConnection(
|
| - mojo::ApplicationConnection* connection) override;
|
| + bool AcceptConnection(mojo::Connection* connection) override;
|
|
|
| // mojo::InterfaceFactory<ResourceProvider>:
|
| - void Create(mojo::ApplicationConnection* connection,
|
| + void Create(mojo::Connection* connection,
|
| mojo::InterfaceRequest<ResourceProvider> request) override;
|
|
|
| mojo::TracingImpl tracing_;
|
|
|