ApplicationManager: Use callback to get notified on application shutdown.

shell/application_manager/shell_impl.h

Index: shell/application_manager/shell_impl.h
diff --git a/shell/application_manager/shell_impl.h b/shell/application_manager/shell_impl.h
index 5f405e5cff8f208af56bd65c0b2d5e200415f2ba..6daa49c0226b65e879c20400fff6d100be8bb51e 100644
--- a/shell/application_manager/shell_impl.h
+++ b/shell/application_manager/shell_impl.h
@@ -5,6 +5,7 @@
 #ifndef SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
 #define SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
 
+#include "base/callback.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
@@ -20,9 +21,8 @@ class ShellImpl : public Shell, public ErrorHandler {
  public:
   ShellImpl(ApplicationPtr application,
             ApplicationManager* manager,
-            // The original URL that was first requested, before any resolution.
-            const GURL& original_url,
-            const GURL& resolved_url);
+            const GURL& url_,
+            const base::Closure& on_application_end);
 
   ~ShellImpl() override;
 
@@ -35,7 +35,7 @@ class ShellImpl : public Shell, public ErrorHandler {
 
   Application* application() { return application_.get(); }
   const GURL& url() const { return url_; }
-  const GURL& requested_url() const { return requested_url_; }
+  base::Closure on_application_end() const { return on_application_end_; }
 
  private:
   // Shell implementation:
@@ -47,8 +47,8 @@ class ShellImpl : public Shell, public ErrorHandler {
   void OnConnectionError() override;
 
   ApplicationManager* const manager_;
-  const GURL requested_url_;
   const GURL url_;
+  base::Closure on_application_end_;
   ApplicationPtr application_;
   Binding<Shell> binding_;