| 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 94bbdd5b32a34d00c8e96d0bc90d46a05dbf5c4e..f832308b3a9521addbd68d5c2200a680d378fbf1 100644
|
| --- a/mash/browser_driver/browser_driver_application_delegate.h
|
| +++ b/mash/browser_driver/browser_driver_application_delegate.h
|
| @@ -31,7 +31,8 @@ class BrowserDriverApplicationDelegate : public mojo::ApplicationDelegate,
|
|
|
| private:
|
| // mojo::ApplicationDelegate:
|
| - void Initialize(mojo::ApplicationImpl* app) override;
|
| + void Initialize(mojo::Shell* shell, const std::string& url,
|
| + uint32_t id) override;
|
| bool AcceptConnection(
|
| mojo::ApplicationConnection* connection) override;
|
|
|
| @@ -40,7 +41,7 @@ class BrowserDriverApplicationDelegate : public mojo::ApplicationDelegate,
|
|
|
| void AddAccelerators();
|
|
|
| - mojo::ApplicationImpl* app_;
|
| + mojo::Shell* shell_;
|
| mojo::Binding<mus::mojom::AcceleratorHandler> binding_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BrowserDriverApplicationDelegate);
|
|
|