| Index: ash/mus/sysui_application.h
|
| diff --git a/ash/mus/sysui_application.h b/ash/mus/sysui_application.h
|
| index 26e8566257876fd2fb1cf84e9d3d0ed3df1deb63..4e8afcee7dca69a0601bf8dbe6e88d3ec96e08dd 100644
|
| --- a/ash/mus/sysui_application.h
|
| +++ b/ash/mus/sysui_application.h
|
| @@ -19,21 +19,21 @@ namespace sysui {
|
| class AshInit;
|
|
|
| class SysUIApplication
|
| - : public mojo::ShellClient,
|
| - public mojo::InterfaceFactory<mash::shelf::mojom::ShelfController> {
|
| + : public shell::ShellClient,
|
| + public shell::InterfaceFactory<mash::shelf::mojom::ShelfController> {
|
| public:
|
| SysUIApplication();
|
| ~SysUIApplication() override;
|
|
|
| private:
|
| - // mojo::ShellClient:
|
| - void Initialize(mojo::Connector* connector,
|
| - const mojo::Identity& identity,
|
| + // shell::ShellClient:
|
| + void Initialize(::shell::Connector* connector,
|
| + const ::shell::Identity& identity,
|
| uint32_t id) override;
|
| - bool AcceptConnection(mojo::Connection* connection) override;
|
| + bool AcceptConnection(shell::Connection* connection) override;
|
|
|
| // InterfaceFactory<mash::shelf::mojom::ShelfController>:
|
| - void Create(mojo::Connection* connection,
|
| + void Create(shell::Connection* connection,
|
| mojo::InterfaceRequest<mash::shelf::mojom::ShelfController>
|
| request) override;
|
|
|
|
|