Hook embedded shell up to MojoShellConnection

mojo/shell/application_manager.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_APPLICATION_MANAGER_H_
 #define MOJO_SHELL_APPLICATION_MANAGER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 62 matching lines @@
   // Provide a callback to be notified whenever an instance is destroyed.
   // Typically the creator of the ApplicationManager will use this to determine
   // when some set of instances it created are destroyed, so it can shut down.
   void SetInstanceQuitCallback(base::Callback<void(const Identity&)> callback);
 
   // 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.
   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);
   }
 
   // Sets a Loader to be used for a specific url.
   void SetLoaderForURL(scoped_ptr<ApplicationLoader> loader, const GURL& url);
 
   // Destroys all Shell-ends of connections established with Applications.
   // Applications connected by this ApplicationManager will observe pipe errors
@@ skipping 81 matching lines @@
   // Loaders are chosen in the order they are listed here.
   URLToLoaderMap url_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
 
   IdentityToInstanceMap identity_to_instance_;
 
   IdentityToShellClientFactoryMap shell_client_factories_;
   // 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_;
   base::TaskRunner* file_task_runner_;
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
   std::vector<scoped_ptr<NativeRunner>> native_runners_;
   scoped_ptr<ShellConnection> shell_connection_;
   WeakBindingSet<mojom::ApplicationManager> bindings_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 mojom::Shell::ConnectCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_APPLICATION_MANAGER_H_