Change primordial pipes to ShellClient

mojo/shell/shell.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 MOJO_SHELL_SHELL_H_
 #define MOJO_SHELL_SHELL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 93 matching lines @@
 
   // Removes a Instance when it encounters an error.
   void OnInstanceError(Instance* instance);
 
   // Completes a connection between a source and target application as defined
   // by |params|, exchanging InterfaceProviders between them. If no existing
   // instance of the target application is running, one will be loaded.
   //
   // If |client| is not null, there must not be an instance of the target
   // application already running. The shell will create a new instance and use
-  // |client| to control.
+  // |client| to control it.
   void Connect(scoped_ptr<ConnectParams> params, mojom::ShellClientPtr client);
 
   // Returns a running instance matching |identity|.
   Instance* GetExistingInstance(const Identity& identity) const;
   // Like GetExistingInstance, but if no instance for |identity.user_id()| is
   // found, looks for kRootUserID too.
   Instance* GetExistingOrRootInstance(const Identity& identity) const;
 
   void NotifyPIDAvailable(uint32_t id, base::ProcessId pid);
 
   // Attempt to complete the connection requested by |params| by connecting to
   // an existing instance. If there is an existing instance, |params| is taken,
   // and this function returns true.
   bool ConnectToExistingInstance(scoped_ptr<ConnectParams>* params);
 
   Instance* CreateInstance(const Identity& target,
-                           const CapabilitySpec& spec,
-                           mojom::ShellClientPtr client);
+                           const CapabilitySpec& spec);
 
   // Called from the instance implementing mojom::Shell.
   void AddInstanceListener(mojom::InstanceListenerPtr listener);
 
-  void CreateShellClient(const Identity& source,
-                         const Identity& shell_client_factory,
-                         const std::string& name,
-                         mojom::ShellClientRequest request);
-  // Returns a running ShellClientFactory for |shell_client_factory_identity|,
-  // if there is not one running one is started for |source_identity|.
+  void CreateShellClientWithFactory(const Identity& source,
+                                    const Identity& shell_client_factory,
+                                    const std::string& name,
+                                    mojom::ShellClientRequest request);
+  // Returns a running ShellClientFactory for |shell_client_factory_identity|.
+  // If there is not one running one is started for |source_identity|.
   mojom::ShellClientFactory* GetShellClientFactory(
       const Identity& shell_client_factory_identity,
       const Identity& source_identity);
-  void OnShellClientFactoryLost(const Identity& which);;
+  void OnShellClientFactoryLost(const Identity& which);
 
   // Callback when remote Catalog resolves mojo:foo to mojo:bar.
   // |params| are the params passed to Connect().
   // |client| if provided is a ShellClientPtr which should be used to manage the
   // new application instance. This may be null.
   // |resolved_name| is the mojo: name identifying the physical package
   // application.
   // |file_url| is the resolved file:// URL of the physical package.
   // |capabilities| is the CapabilitySpecPtr the requested application should be
   // run with, from its manifest.
@@ skipping 17 matching lines @@
   void CleanupRunner(NativeRunner* runner);
 
   // Loader management.
   // Loaders are chosen in the order they are listed here.
   NameToLoaderMap name_to_loader_;
   scoped_ptr<Loader> default_loader_;
 
   IdentityToInstanceMap identity_to_instance_;
 
   IdentityToShellClientFactoryMap shell_client_factories_;
-  // Counter used to assign ids to content handlers.
+  // Counter used to assign ids to client factories.
   uint32_t shell_client_factory_id_counter_;
 
   InterfacePtrSet<mojom::InstanceListener> instance_listeners_;
 
   base::Callback<void(const Identity&)> instance_quit_callback_;
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
   std::vector<scoped_ptr<NativeRunner>> native_runners_;
   scoped_ptr<ShellConnection> shell_connection_;
   base::WeakPtrFactory<Shell> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 mojom::Connector::ConnectCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_SHELL_H_