Hook embedded shell up to MojoShellConnection

mojo/shell/application_manager.h

Index: mojo/shell/application_manager.h
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index b6e657c426b8c8a1b4aa53579dc41f6cc2d1fa8d..cf3d7d066fa00614e776789335343521d2ba7f3b 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -80,6 +80,12 @@ class ApplicationManager : public ShellClient,
   // instance of the target application is running, one will be loaded.
   void Connect(scoped_ptr<ConnectParams> params);
 
+  // Creates a new ApplicationInstance identified as |url|. This is intended for
+  // use by the ApplicationManager's embedder to register itself with the shell.
+  // |url| is never resolves, there mmust not have an existing instance for the

[Ben Goodger (Google), 2016/02/25 04:53:37]

please re-read this sentence and fix all the typos.

[Ken Rockot(use gerrit already), 2016/02/25 05:08:24]

yikes - fixed

+  // given URL. This must only be called once.
+  mojom::ShellClientRequest InitInstanceForEmbedder(const GURL& url);
+
   // Sets the default Loader to be used if not overridden by SetLoaderForURL().
   void set_default_loader(scoped_ptr<ApplicationLoader> loader) {
     default_loader_ = std::move(loader);
@@ -181,6 +187,9 @@ class ApplicationManager : public ShellClient,
   // Counter used to assign ids to content handlers.
   uint32_t shell_client_factory_id_counter_;
 
+  // The ApplicationInstance created by the shell embedder, if any.
+  ApplicationInstance* embedder_instance_ = nullptr;
+
   WeakInterfacePtrSet<mojom::ApplicationManagerListener> listeners_;
 
   base::Callback<void(const Identity&)> instance_quit_callback_;