| Index: third_party/mojo/src/mojo/public/cpp/application/application_impl.h
|
| diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_impl.h b/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
|
| index 21d44d3cc667a726b742a1664b6f2eb4678ec0a0..af85d3eea4b475751331598cb56c87507acb6de3 100644
|
| --- a/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
|
| +++ b/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
|
| @@ -7,6 +7,7 @@
|
| #include <vector>
|
|
|
| #include "mojo/public/cpp/application/application_connection.h"
|
| +#include "mojo/public/cpp/application/application_delegate.h"
|
| #include "mojo/public/cpp/application/lib/service_connector.h"
|
| #include "mojo/public/cpp/application/lib/service_registry.h"
|
| #include "mojo/public/cpp/system/core.h"
|
| @@ -15,8 +16,6 @@
|
|
|
| namespace mojo {
|
|
|
| -class ApplicationDelegate;
|
| -
|
| // Utility class for communicating with the Shell, and providing Services
|
| // to clients.
|
| //
|
| @@ -107,6 +106,7 @@ class ApplicationImpl : public Application {
|
| void ClearConnections();
|
|
|
| void OnShellError() {
|
| + delegate_->Quit();
|
| ClearConnections();
|
| Terminate();
|
| }
|
| @@ -114,7 +114,8 @@ class ApplicationImpl : public Application {
|
| // Application implementation.
|
| void AcceptConnection(const String& requestor_url,
|
| InterfaceRequest<ServiceProvider> services,
|
| - ServiceProviderPtr exposed_services) override;
|
| + ServiceProviderPtr exposed_services,
|
| + const String& url) override;
|
|
|
| void RequestQuit() override;
|
|
|
|
|