| 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 bb92307f00ad1c48d4287182e7ab256821ecf4f7..46d368def198f5b7ba595a2e59b45c03afd0bbbc 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
|
| @@ -79,20 +79,15 @@ class ApplicationImpl : public Application {
|
| // Block until the Application is initialized, if it is not already.
|
| void WaitForInitialize();
|
|
|
| - // Unbinds the Shell and Application connections. Must be called after
|
| - // Initialize.
|
| + // Unbinds the Shell and Application connections. Can be used to re-bind the
|
| + // handles to another implementation of ApplicationImpl, for instance when
|
| + // running apptests.
|
| void UnbindConnections(InterfaceRequest<Application>* application_request,
|
| ShellPtr* shell);
|
|
|
| // Quits the main run loop for this application.
|
| static void Terminate();
|
|
|
| - protected:
|
| - // Application implementation.
|
| - void AcceptConnection(const String& requestor_url,
|
| - InterfaceRequest<ServiceProvider> services,
|
| - ServiceProviderPtr exposed_services) override;
|
| -
|
| private:
|
| class ShellPtrWatcher;
|
|
|
| @@ -103,11 +98,15 @@ class ApplicationImpl : public Application {
|
| Terminate();
|
| }
|
|
|
| + // Application implementation.
|
| + void AcceptConnection(const String& requestor_url,
|
| + InterfaceRequest<ServiceProvider> services,
|
| + ServiceProviderPtr exposed_services) override;
|
| +
|
| void RequestQuit() override;
|
|
|
| typedef std::vector<internal::ServiceRegistry*> ServiceRegistryList;
|
|
|
| - bool initialized_;
|
| ServiceRegistryList incoming_service_registries_;
|
| ServiceRegistryList outgoing_service_registries_;
|
| ApplicationDelegate* delegate_;
|
|
|