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

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: self review 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..c61a616851f0964263d4fd37bffa7540d1e549e9 100644
--- a/mojo/shell/application_manager.cc
+++ b/mojo/shell/application_manager.cc
@@ -98,6 +98,22 @@ void ApplicationManager::Connect(scoped_ptr<ConnectParams> params) {
weak_ptr_factory_.GetWeakPtr(), base::Passed(&params)));
}
+mojom::ShellClientRequest ApplicationManager::CreateInstanceForURL(
+ scoped_ptr<ConnectParams> params) {
+ DCHECK(params->target().url().is_valid());
+ DCHECK(params->target().user_id() == mojom::Shell::kUserRoot);
+ DCHECK(!GetApplicationInstance(params->target()));
+
+ Identity target(params->target().url(), params->target().qualifier(),
+ params->target().user_id(), params->target().filter());
+
+ mojom::ShellClientRequest request;
+ ApplicationInstance* instance = CreateInstance(target, &request);
+ instance->ConnectToClient(std::move(params));
+
+ 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