ApplicationManager: Use callback to get notified on application shutdown.

shell/application_manager/application_manager.h

Index: shell/application_manager/application_manager.h
diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h
index 8aaf5bd0d5f36606ad8d897a1a00e2ffd7609a46..7805b9f9182e94471513d99c8cfba9bb781af3f2 100644
--- a/shell/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.h
@@ -36,9 +36,6 @@ class ApplicationManager {
   class Delegate {
    public:
     virtual ~Delegate();
-    // Send when the Application holding the handle on the other end of the
-    // Shell pipe goes away.
-    virtual void OnApplicationError(const GURL& url);
     virtual GURL ResolveURL(const GURL& url);
     virtual GURL ResolveMappings(const GURL& url);
   };
@@ -67,7 +64,8 @@ class ApplicationManager {
   void ConnectToApplication(const GURL& application_url,
                             const GURL& requestor_url,
                             InterfaceRequest<ServiceProvider> services,
-                            ServiceProviderPtr exposed_services);
+                            ServiceProviderPtr exposed_services,
+                            const base::Closure& on_application_end);
 
   template <typename Interface>
   inline void ConnectToService(const GURL& application_url,
@@ -145,6 +143,7 @@ class ApplicationManager {
       const GURL& requestor_url,
       InterfaceRequest<ServiceProvider> services,
       ServiceProviderPtr exposed_services,
+      const base::Closure& on_application_end,
       const std::vector<std::string>& parameters);
 
   bool ConnectToRunningApplication(const GURL& resolved_url,
@@ -153,24 +152,21 @@ class ApplicationManager {
                                    ServiceProviderPtr* exposed_services);
 
   bool ConnectToApplicationWithLoader(
-      const GURL& requested_url,
       const GURL& resolved_url,
       const GURL& requestor_url,
       InterfaceRequest<ServiceProvider>* services,
       ServiceProviderPtr* exposed_services,
+      const base::Closure& on_application_end,
       const std::vector<std::string>& parameters,
       ApplicationLoader* loader);
 
   InterfaceRequest<Application> RegisterShell(
-      // The original URL requested by client, before any resolution or
-      // redirects.
-      // This is mostly useless and should be removed.
-      const GURL& original_url,
       // The URL after resolution and redirects, including the querystring.
       const GURL& resolved_url,
       const GURL& requestor_url,
       InterfaceRequest<ServiceProvider> services,
       ServiceProviderPtr exposed_services,
+      const base::Closure& on_application_end,
       const std::vector<std::string>& parameters);
 
   ShellImpl* GetShellImpl(const GURL& url);
@@ -181,10 +177,10 @@ class ApplicationManager {
                        InterfaceRequest<ServiceProvider> services,
                        ServiceProviderPtr exposed_services);
 
-  void HandleFetchCallback(const GURL& requested_url,
-                           const GURL& requestor_url,
+  void HandleFetchCallback(const GURL& requestor_url,
                            InterfaceRequest<ServiceProvider> services,
                            ServiceProviderPtr exposed_services,
+                           const base::Closure& on_application_end,
                            const std::vector<std::string>& parameters,
                            NativeRunner::CleanupBehavior cleanup_behavior,
                            scoped_ptr<Fetcher> fetcher);