| Index: mash/browser/browser.h
|
| diff --git a/mash/browser/browser.h b/mash/browser/browser.h
|
| index 765898cdc30e6c80cd36a44055a7ba22fe355ee9..00fd1e5758f692dac3746e17da1862ac3112055b 100644
|
| --- a/mash/browser/browser.h
|
| +++ b/mash/browser/browser.h
|
| @@ -26,9 +26,9 @@ class WindowManagerConnection;
|
| namespace mash {
|
| namespace browser {
|
|
|
| -class Browser : public shell::Service,
|
| +class Browser : public service_manager::Service,
|
| public mojom::Launchable,
|
| - public shell::InterfaceFactory<mojom::Launchable> {
|
| + public service_manager::InterfaceFactory<mojom::Launchable> {
|
| public:
|
| Browser();
|
| ~Browser() override;
|
| @@ -42,16 +42,16 @@ class Browser : public shell::Service,
|
| std::unique_ptr<navigation::View> CreateView();
|
|
|
| private:
|
| - // shell::Service:
|
| - void OnStart(const shell::Identity& identity) override;
|
| - bool OnConnect(const shell::Identity& remote_identity,
|
| - shell::InterfaceRegistry* registry) override;
|
| + // service_manager::Service:
|
| + void OnStart(const service_manager::Identity& identity) override;
|
| + bool OnConnect(const service_manager::Identity& remote_identity,
|
| + service_manager::InterfaceRegistry* registry) override;
|
|
|
| // mojom::Launchable:
|
| void Launch(uint32_t what, mojom::LaunchMode how) override;
|
|
|
| - // shell::InterfaceFactory<mojom::Launchable>:
|
| - void Create(const shell::Identity& remote_identity,
|
| + // service_manager::InterfaceFactory<mojom::Launchable>:
|
| + void Create(const service_manager::Identity& remote_identity,
|
| mojom::LaunchableRequest request) override;
|
|
|
| mojo::BindingSet<mojom::Launchable> bindings_;
|
|
|