Remove Client relationship between mojo.Shell/mojo.Application

shell/external_application_listener.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 SHELL_EXTERNAL_APPLICATION_LISTENER_H_
 #define SHELL_EXTERNAL_APPLICATION_LISTENER_H_
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/edk/embedder/channel_init.h"
-#include "mojo/public/interfaces/application/shell.mojom.h"
+#include "mojo/public/interfaces/application/application.mojom.h"
 #include "shell/domain_socket/socket_descriptor.h"
 #include "shell/external_application_registrar.mojom.h"
 #include "shell/incoming_connection_listener.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 
-// In order to support Mojo apps whose lifetime is managed by
-// something other than mojo_shell, mojo_shell needs to support a
-// mechanism by which such an application can discover a running shell
-// instance, connect to it, and ask to be "registered" at a given
-// URL. Registration implies that the app can be connected to at that
-// URL from then on out, and that the app has received a usable ShellPtr.
+// In order to support Mojo apps whose lifetime is managed by something other
+// than mojo_shell, mojo_shell needs to support a mechanism by which such an
+// application can discover a running shell instance, connect to it, and ask to
+// be "registered" at a given URL. Registration implies that the app can be
+// connected to at that URL from then on out, and that the app has a connection
+// to the shell.  Once registered the shell will treat the external application
+// as if it was started from the shell and make a mojo.Application.Initialize()
+// call on it, passing it a handle to the mojo.Shell interface.
 //
 // This class implements most of the mojo_shell side of external application
 // registration. It handles:
 //  1) discoverability - sets up a unix domain socket at a well-known location,
 //  2) incoming connections - listens for and accepts incoming connections on
 //     that socket, and
 //  3) registration requests - forwarded to a RegisterCallback that implements
 //     the actual registration logic.
 //
 // External applications can connect to the shell using the
 // ExternalApplicationRegistrarConnection class.
 class ExternalApplicationListener
     : public IncomingConnectionListener::Delegate {
  public:
   // When run, a RegisterCallback should note that an app has asked to be
-  // registered at app_url and Bind the provided pipe handle to a ShellImpl.
+  // registered at app_url and Bind the provided pipe handle to an
+  // ApplicationPtr to be initialized.
   using RegisterCallback =
       base::Callback<void(const GURL& app_url,
                           const std::vector<std::string>& args,
-                          ScopedMessagePipeHandle shell)>;
+                          ApplicationPtr application)>;
   using ErrorCallback = base::Callback<void(int rv)>;
 
   static base::FilePath ConstructDefaultSocketPath();
 
   // This class uses two threads, an IO thread for listening and accepting
   // incoming sockets, and a "main" thread where all Mojo traffic is processed
   // and provided callbacks are run.
   ExternalApplicationListener(
       const scoped_refptr<base::SequencedTaskRunner>& shell_runner,
       const scoped_refptr<base::SequencedTaskRunner>& io_runner);
@@ skipping 65 matching lines @@
   base::ThreadChecker register_thread_checker_;
 
   // Used on shell_runner_.
   base::WeakPtrFactory<ExternalApplicationListener> weak_ptr_factory_;
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // SHELL_EXTERNAL_APPLICATION_LISTENER_H_