| Index: mash/example/views_examples/views_examples_application_delegate.h
|
| diff --git a/mash/example/views_examples/views_examples_application_delegate.h b/mash/example/views_examples/views_examples_application_delegate.h
|
| index 29091266d2e71ac1be5018203da7bce2b0704d2c..a8d9a4f1e4faffc499e8e1f838954aae261a21e2 100644
|
| --- a/mash/example/views_examples/views_examples_application_delegate.h
|
| +++ b/mash/example/views_examples/views_examples_application_delegate.h
|
| @@ -8,23 +8,22 @@
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "mojo/services/tracing/public/cpp/tracing_impl.h"
|
| -#include "mojo/shell/public/cpp/application_delegate.h"
|
| +#include "mojo/shell/public/cpp/shell_client.h"
|
|
|
| namespace views {
|
| class AuraInit;
|
| }
|
|
|
| -class ViewsExamplesApplicationDelegate : public mojo::ApplicationDelegate {
|
| +class ViewsExamplesApplicationDelegate : public mojo::ShellClient {
|
| public:
|
| ViewsExamplesApplicationDelegate();
|
| ~ViewsExamplesApplicationDelegate() override;
|
|
|
| private:
|
| - // ApplicationDelegate:
|
| + // mojo::ShellClient:
|
| void Initialize(mojo::Shell* shell, const std::string& url,
|
| uint32_t id) override;
|
| - bool AcceptConnection(
|
| - mojo::ApplicationConnection* connection) override;
|
| + bool AcceptConnection(mojo::Connection* connection) override;
|
|
|
| mojo::TracingImpl tracing_;
|
|
|
|
|