diff options
| author | sky <sky@chromium.org> | 2016-02-14 10:08:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-14 18:10:02 +0000 |
| commit | b03560f2f020c4460a2e1b604b563aa852715237 (patch) | |
| tree | b95c48ddded3aacd17d13274641142b4aef502fd /mojo/shell/application_manager.cc | |
| parent | 7bf90d0b46086e11a0ba9a73b94ec43d5737d0b6 (diff) | |
| download | chromium_src-b03560f2f020c4460a2e1b604b563aa852715237.zip chromium_src-b03560f2f020c4460a2e1b604b563aa852715237.tar.gz chromium_src-b03560f2f020c4460a2e1b604b563aa852715237.tar.bz2 | |
Couple of changes to shell:
. Adds PackageManager::BuildinAppLoaded(). This is needed else we
don't attempt to read the manifest for apps loaded via
ApplicationLoaders.
. Replaces CHECK in PackageManagerImpl::DeserializeApplication with
early out. The CHECK is problematic in the case of apps referring to
other apps.
. Adds type to mojo_application_manifest as executables need to be
handled differently.
BUG=581539
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1691213003
Cr-Commit-Position: refs/heads/master@{#375388}
Diffstat (limited to 'mojo/shell/application_manager.cc')
| -rw-r--r-- | mojo/shell/application_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc index b8dda51..4912803 100644 --- a/mojo/shell/application_manager.cc +++ b/mojo/shell/application_manager.cc @@ -96,7 +96,8 @@ void ApplicationManager::ConnectToApplication( ApplicationLoader* loader = GetLoaderForURL(params->target().url()); if (loader) { - GURL url = params->target().url(); + const GURL url = params->target().url(); + package_manager_->BuiltinAppLoaded(url); loader->Load(url, CreateAndConnectToInstance(std::move(params), nullptr)); return; } |