Revert 287680 "mojo: terminate apps if the shell goes away"

trunk/src/mojo/public/cpp/application/application_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
 #define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
 #include <vector>
 
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/lib/service_connector.h"
@@ skipping 41 matching lines @@
 // };
 //
 // or
 //
 // class BarImpl : public InterfaceImpl<Bar> {
 //  public:
 //   // contexts will remain valid for the lifetime of BarImpl.
 //   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>();
 //
 // BarContext context;
 // app.AddService<BarImpl>(&context);
 //
 //
 class ApplicationImpl : public InterfaceImpl<Application> {
  public:
   explicit ApplicationImpl(ApplicationDelegate* delegate);
   ApplicationImpl(ApplicationDelegate* delegate,
                   ScopedMessagePipeHandle shell_handle);
   ApplicationImpl(ApplicationDelegate* delegate,
                   MojoHandle shell_handle);
   virtual ~ApplicationImpl();
 
   // Establishes a new connection to an application. Caller does not own.
   ApplicationConnection* ConnectToApplication(const String& application_url);
 
   // Connect to application identified by |application_url| and connect to the
   // service implementation of the interface identified by |Interface|.
   template <typename Interface>
   void ConnectToService(const std::string& application_url,
                         InterfacePtr<Interface>* ptr) {
     ConnectToApplication(application_url)->ConnectToService(ptr);
   }
 
  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;
 
   typedef std::vector<internal::ServiceRegistry*> ServiceRegistryList;
   ServiceRegistryList incoming_service_registries_;
   ServiceRegistryList outgoing_service_registries_;
   ApplicationDelegate* delegate_;
   ShellPtr shell_;
-  ShellPtrWatcher shell_watch_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_