Index: mojo/shell/application_manager.h |
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h |
index fb1763bc358c444781bc7a6c78eec5fa5d93c15b..92ed969e696fb20d77e05d219a292550729c8a09 100644 |
--- a/mojo/shell/application_manager.h |
+++ b/mojo/shell/application_manager.h |
@@ -83,6 +83,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. |
+ // The URL is never resolved and there must not be an existing instance |
+ // associated with it. 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); |
@@ -186,6 +192,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; |
+ |
InterfacePtrSet<mojom::ApplicationManagerListener> listeners_; |
base::Callback<void(const Identity&)> instance_quit_callback_; |