Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: trunk/src/mojo/public/cpp/application/application_impl.h

Issue 443063003: Revert 287680 "mojo: terminate apps if the shell goes away" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/mojo/public/cpp/application/application_impl.h
===================================================================
--- trunk/src/mojo/public/cpp/application/application_impl.h (revision 287751)
+++ trunk/src/mojo/public/cpp/application/application_impl.h (working copy)
@@ -59,7 +59,7 @@
// BarImpl(ApplicationContext* app_context, BarContext* service_context)
// : app_context_(app_context), servicecontext_(context) {}
//
-// Create an ApplicationImpl instance that collects any service implementations.
+// Create an ApplicationDele instance that collects any service implementations.
//
// ApplicationImpl app(service_provider_handle);
// app.AddService<FooImpl>();
@@ -89,26 +89,11 @@
}
private:
- class ShellPtrWatcher : public ErrorHandler {
- public:
- explicit ShellPtrWatcher(ApplicationImpl* impl);
- virtual ~ShellPtrWatcher();
- virtual void OnConnectionError() MOJO_OVERRIDE;
- private:
- ApplicationImpl* impl_;
- MOJO_DISALLOW_COPY_AND_ASSIGN(ShellPtrWatcher);
- };
-
friend MojoResult (::MojoMain)(MojoHandle);
void BindShell(ScopedMessagePipeHandle shell_handle);
void BindShell(MojoHandle shell_handle);
- void ClearConnections();
- void OnShellError() { ClearConnections(); Terminate(); };
- // Quits the main run loop for this application.
- void Terminate();
-
// Application implementation.
virtual void AcceptConnection(const String& requestor_url,
ServiceProviderPtr provider) MOJO_OVERRIDE;
@@ -118,7 +103,6 @@
ServiceRegistryList outgoing_service_registries_;
ApplicationDelegate* delegate_;
ShellPtr shell_;
- ShellPtrWatcher shell_watch_;
MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
};
« no previous file with comments | « trunk/src/mojo/public/cpp/application/DEPS ('k') | trunk/src/mojo/public/cpp/application/lib/application_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698