Index: content/browser/mojo/mojo_shell_context.cc |
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc |
index 2817731da4426a5d1201b013c9091e1ee9c84142..80120da9170c197e523cc4383daf23353e9bbd70 100644 |
--- a/content/browser/mojo/mojo_shell_context.cc |
+++ b/content/browser/mojo/mojo_shell_context.cc |
@@ -6,6 +6,7 @@ |
#include "base/lazy_instance.h" |
#include "base/macros.h" |
+#include "base/path_service.h" |
#include "base/single_thread_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
#include "content/common/process_control.mojom.h" |
@@ -17,6 +18,7 @@ |
#include "content/public/common/service_registry.h" |
#include "mojo/application/public/cpp/application_delegate.h" |
#include "mojo/common/url_type_converters.h" |
+#include "mojo/fetcher/base_application_fetcher.h" |
#include "mojo/shell/application_loader.h" |
#include "mojo/shell/connect_to_application_params.h" |
#include "mojo/shell/identity.h" |
@@ -152,10 +154,16 @@ void MojoShellContext::SetApplicationsForTest( |
g_applications_for_test = apps; |
} |
-MojoShellContext::MojoShellContext() |
- : application_manager_(new mojo::shell::ApplicationManager(this)) { |
+MojoShellContext::MojoShellContext() { |
proxy_.Get().reset(new Proxy(this)); |
+ // Construct with an empty filepath since mojo: urls can't be registered now |
+ // the url scheme registry is locked. |
+ scoped_ptr<mojo::fetcher::BaseApplicationFetcher> fetcher( |
+ new mojo::fetcher::BaseApplicationFetcher(base::FilePath())); |
+ application_manager_.reset( |
+ new mojo::shell::ApplicationManager(fetcher.Pass())); |
+ |
application_manager_->set_default_loader( |
scoped_ptr<mojo::shell::ApplicationLoader>(new DefaultApplicationLoader)); |
@@ -240,18 +248,4 @@ void MojoShellContext::ConnectToApplicationOnOwnThread( |
application_manager_->ConnectToApplication(params.Pass()); |
} |
-GURL MojoShellContext::ResolveMappings(const GURL& url) { |
- return url; |
-} |
- |
-GURL MojoShellContext::ResolveMojoURL(const GURL& url) { |
- return url; |
-} |
- |
-bool MojoShellContext::CreateFetcher( |
- const GURL& url, |
- const mojo::shell::Fetcher::FetchCallback& loader_callback) { |
- return false; |
-} |
- |
} // namespace content |