| Index: mash/catalog_viewer/catalog_viewer.h
|
| diff --git a/mash/catalog_viewer/catalog_viewer.h b/mash/catalog_viewer/catalog_viewer.h
|
| index 09811e1ceac99785516c45f9770409e776563e70..8d4e394c224f090e60d6d6ad29cf269f3a232146 100644
|
| --- a/mash/catalog_viewer/catalog_viewer.h
|
| +++ b/mash/catalog_viewer/catalog_viewer.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/macros.h"
|
| #include "mash/public/interfaces/launchable.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding_set.h"
|
| +#include "services/service_manager/public/cpp/binder_registry.h"
|
| #include "services/service_manager/public/cpp/interface_factory.h"
|
| #include "services/service_manager/public/cpp/service.h"
|
| #include "services/tracing/public/cpp/provider.h"
|
| @@ -37,8 +38,9 @@ class CatalogViewer
|
| private:
|
| // service_manager::Service:
|
| void OnStart() override;
|
| - bool OnConnect(const service_manager::ServiceInfo& remote_info,
|
| - service_manager::InterfaceRegistry* registry) override;
|
| + void OnBindInterface(const service_manager::ServiceInfo& source_info,
|
| + const std::string& interface_name,
|
| + mojo::ScopedMessagePipeHandle interface_pipe) override;
|
|
|
| // mojom::Launchable:
|
| void Launch(uint32_t what, mojom::LaunchMode how) override;
|
| @@ -50,6 +52,8 @@ class CatalogViewer
|
| mojo::BindingSet<mojom::Launchable> bindings_;
|
| std::vector<views::Widget*> windows_;
|
|
|
| + service_manager::BinderRegistry registry_;
|
| +
|
| tracing::Provider tracing_;
|
| std::unique_ptr<views::AuraInit> aura_init_;
|
|
|
|
|