Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: mojo/shell/application_manager.cc

Issue 1738663002: Hook embedded shell up to MojoShellConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/shell/application_manager.cc
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc
index c24e36a04c4d8567a8849d35c956602aebf385f4..9c5cfca229262cdac1360bc014e4cfb27e5ea3e5 100644
--- a/mojo/shell/application_manager.cc
+++ b/mojo/shell/application_manager.cc
@@ -98,6 +98,21 @@ void ApplicationManager::Connect(scoped_ptr<ConnectParams> params) {
weak_ptr_factory_.GetWeakPtr(), base::Passed(&params)));
}
+mojom::ShellClientRequest ApplicationManager::InitInstanceForEmbedder(
+ const GURL& url) {
+ DCHECK(!embedder_instance_);
+
+ mojo::shell::Identity target(url, std::string(), mojom::Shell::kUserRoot,
+ GetPermissiveCapabilityFilter());
+ DCHECK(!GetApplicationInstance(target));
+
+ mojom::ShellClientRequest request;
+ embedder_instance_ = CreateInstance(target, &request);
+ DCHECK(embedder_instance_);
+
+ return request;
+}
+
void ApplicationManager::SetLoaderForURL(scoped_ptr<ApplicationLoader> loader,
const GURL& url) {
URLToLoaderMap::iterator it = url_to_loader_.find(url);

Powered by Google App Engine
This is Rietveld 408576698