| 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(¶ms)));
|
| }
|
|
|
| +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);
|
|
|