summaryrefslogtreecommitdiffstats
path: root/mojo/shell/standalone
diff options
context:
space:
mode:
authorben <ben@chromium.org>2016-02-01 17:59:11 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-02 02:01:52 +0000
commitaab3147b2e1f1d48113cb5c65b4224c497be3e4c (patch)
treefff37171d0de7f85670ff44bd6e7b1a36242b4de /mojo/shell/standalone
parent58412186f7384edec6eb83f5e6c5f52dee9ab256 (diff)
downloadchromium_src-aab3147b2e1f1d48113cb5c65b4224c497be3e4c.zip
chromium_src-aab3147b2e1f1d48113cb5c65b4224c497be3e4c.tar.gz
chromium_src-aab3147b2e1f1d48113cb5c65b4224c497be3e4c.tar.bz2
Implement a skeleton of Mojo Application manifests.
In this first cut, when a local .mojo or .exe target is loaded, we look for a manifest json file nearby and consume it into a catalog maintained by the PackageManagerImpl. Default manifests are provided for several interesting Mojo apps in Chromium, with pretty names to make the Mash Task Viewer look a little nicer. Future CL improvements: - comprehensive testing. currently mojo_shell_apptests is broken due to the EDK change. - persisting the consumed catalog in a single store (e.g. Preferences) so that we don't need to read a bunch of files every startup. i.e. implement ApplicationCatalogStore. - block creating the ApplicationInstance on having read the manifest, so the base CapabilityFilter is understood. - implement base CapabilityFilter application. R=rockot@chromium.org http://crbug.com/575858 Review URL: https://codereview.chromium.org/1641043002 Cr-Commit-Position: refs/heads/master@{#372853}
Diffstat (limited to 'mojo/shell/standalone')
-rw-r--r--mojo/shell/standalone/context.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc
index 22e9414..f03cb61 100644
--- a/mojo/shell/standalone/context.cc
+++ b/mojo/shell/standalone/context.cc
@@ -215,8 +215,8 @@ bool Context::Init(const base::FilePath& shell_file_root) {
task_runners_->io_runner(),
embedder::ScopedPlatformHandle());
- package_manager_ =
- new PackageManagerImpl(shell_file_root, task_runners_->blocking_pool());
+ package_manager_ = new PackageManagerImpl(
+ shell_file_root, task_runners_->blocking_pool(), nullptr);
InitContentHandlers(package_manager_, command_line);
RegisterLocalAliases(package_manager_);