7/ Eliminate on_application_end from ConnectParams

mojo/shell/standalone/context.h

 // Copyright 2013 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_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"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/standalone/tracer.h"
 #include "url/gurl.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace mojo {
 namespace shell {
-class NativeApplicationLoader;
 
 // The "global" context for the shell's main process.
 class Context : public edk::ProcessDelegate {
  public:
   Context();
   ~Context() override;
 
   static void EnsureEmbedderIsInitialized();
 
   // This must be called with a message loop set up for the current thread,
   // which must remain alive until after Shutdown() is called.
   void Init(const base::FilePath& shell_file_root);
 
   // If Init() was called and succeeded, this must be called before destruction.
   void Shutdown();
 
-  // NOTE: call either Run() or RunCommandLineApplication(), but not both.
+  // Run the application specified on the command line.
+  void RunCommandLineApplication();
+
+ private:
+  // edk::ProcessDelegate:
+  void OnShutdownComplete() override;
 
   // 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();
-  }
-
- private:
-  class NativeViewportApplicationLoader;
-
-  // ProcessDelegate implementation.
-  void OnShutdownComplete() override;
-
-  void OnApplicationEnd(const GURL& url);
-
-  std::set<GURL> app_urls_;
-
   scoped_refptr<base::SingleThreadTaskRunner> shell_runner_;
   scoped_ptr<base::Thread> io_thread_;
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   // Ensure this is destructed before task_runners_ since it owns a message pipe
   // 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);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_STANDALONE_CONTEXT_H_