7/ Eliminate on_application_end from ConnectParams

mojo/shell/standalone/context.h

Index: mojo/shell/standalone/context.h
diff --git a/mojo/shell/standalone/context.h b/mojo/shell/standalone/context.h
index d26b8f8ddb0836d4e90b503f0346a35a71baf29e..f6a83c942f356afb57b53212bd27014f3b2148ab 100644
--- a/mojo/shell/standalone/context.h
+++ b/mojo/shell/standalone/context.h
@@ -5,9 +5,6 @@
 #ifndef MOJO_SHELL_STANDALONE_CONTEXT_H_
 #define MOJO_SHELL_STANDALONE_CONTEXT_H_
 
-#include <set>
-#include <string>
-
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -25,7 +22,6 @@ class SingleThreadTaskRunner;
 
 namespace mojo {
 namespace shell {
-class NativeApplicationLoader;
 
 // The "global" context for the shell's main process.
 class Context : public edk::ProcessDelegate {
@@ -42,28 +38,15 @@ class Context : public edk::ProcessDelegate {
   // If Init() was called and succeeded, this must be called before destruction.
   void Shutdown();
 
-  // NOTE: call either Run() or RunCommandLineApplication(), but not both.
-
-  // Runs the app specified by |url|.
-  void Run(const GURL& url);
-
-  // Run the application specified on the commandline. When the app finishes,
-  // |callback| is run if not null, otherwise the message loop is quit.
-  void RunCommandLineApplication(const base::Closure& callback);
-
-  ApplicationManager* application_manager() {
-    return application_manager_.get();
-  }
+  // Run the application specified on the command line.
+  void RunCommandLineApplication();
 
  private:
-  class NativeViewportApplicationLoader;
-
-  // ProcessDelegate implementation.
+  // edk::ProcessDelegate:
   void OnShutdownComplete() override;
 
-  void OnApplicationEnd(const GURL& url);
-
-  std::set<GURL> app_urls_;
+  // Runs the app specified by |url|.
+  void Run(const GURL& url);
 
   scoped_refptr<base::SingleThreadTaskRunner> shell_runner_;
   scoped_ptr<base::Thread> io_thread_;
@@ -73,7 +56,6 @@ class Context : public edk::ProcessDelegate {
   // that needs the IO thread to destruct cleanly.
   Tracer tracer_;
   scoped_ptr<ApplicationManager> application_manager_;
-  base::Closure app_complete_callback_;
   base::Time main_entry_time_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);