| Index: mash/browser_driver/browser_driver_application_delegate.h
|
| diff --git a/mash/browser_driver/browser_driver_application_delegate.h b/mash/browser_driver/browser_driver_application_delegate.h
|
| index 2a251c26fe4f97d8f32cf2145cf06b77ed69a6e8..73c34aad995e366b5c6e210e7b9e7ef5b33c743e 100644
|
| --- a/mash/browser_driver/browser_driver_application_delegate.h
|
| +++ b/mash/browser_driver/browser_driver_application_delegate.h
|
| @@ -19,17 +19,18 @@
|
| namespace mash {
|
| namespace browser_driver {
|
|
|
| -class BrowserDriverApplicationDelegate : public mojo::ShellClient,
|
| +class BrowserDriverApplicationDelegate : public shell::ShellClient,
|
| public mus::mojom::AcceleratorHandler {
|
| public:
|
| BrowserDriverApplicationDelegate();
|
| ~BrowserDriverApplicationDelegate() 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;
|
| bool ShellConnectionLost() override;
|
|
|
| // mus::mojom::AcceleratorHandler:
|
| @@ -37,7 +38,7 @@ class BrowserDriverApplicationDelegate : public mojo::ShellClient,
|
|
|
| void AddAccelerators();
|
|
|
| - mojo::Connector* connector_;
|
| + shell::Connector* connector_;
|
| mojo::Binding<mus::mojom::AcceleratorHandler> binding_;
|
| base::WeakPtrFactory<BrowserDriverApplicationDelegate> weak_factory_;
|
|
|
|
|