Use chrome manifest with embedded shell

mojo/shell/shell.h

Index: mojo/shell/shell.h
diff --git a/mojo/shell/shell.h b/mojo/shell/shell.h
index 9a3e2e9a7e2cdab8de67764bf8bfe55827884747..b0b00c9519a981f95423dc8fc90a96fd182b5dbb 100644
--- a/mojo/shell/shell.h
+++ b/mojo/shell/shell.h
@@ -72,9 +72,8 @@ class Shell : public ShellClient {
   void Connect(scoped_ptr<ConnectParams> params);
 
   // Creates a new Instance identified as |name|. This is intended for use by
-  // the Shell's embedder to register itself with the shell. The name is never
-  // resolved and there must not be an existing instance associated with it.
-  // This must only be called once.
+  // the Shell's embedder to register itself with the shell. This must only be
+  // called once.
   mojom::ShellClientRequest InitInstanceForEmbedder(const std::string& name);
 
   // Sets the default Loader to be used if not overridden by SetLoaderForName().
@@ -106,6 +105,15 @@ class Shell : public ShellClient {
   // 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.
+  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
@@ -139,12 +147,15 @@ class Shell : public ShellClient {
 
   // 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.
-  // |base_filter| is the CapabilitySpecPtr the requested application should be
+  // |capabilities| is the CapabilitySpecPtr the requested application should be
   // run with, from its manifest.
   void OnGotResolvedName(scoped_ptr<ConnectParams> params,
+                         mojom::ShellClientPtr client,
                          const String& resolved_name,
                          const String& resolved_instance,
                          mojom::CapabilitySpecPtr capabilities,
@@ -174,9 +185,6 @@ class Shell : public ShellClient {
   // Counter used to assign ids to content handlers.
   uint32_t shell_client_factory_id_counter_;
 
-  // The Instance created by the shell embedder, if any.
-  Instance* embedder_instance_ = nullptr;
-
   InterfacePtrSet<mojom::InstanceListener> instance_listeners_;
 
   base::Callback<void(const Identity&)> instance_quit_callback_;