diff options
| author | fsamuel <fsamuel@chromium.org> | 2015-08-11 08:22:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-11 15:23:02 +0000 |
| commit | 411de5c8ce7feaeb3f1d56881a0ea1db7a9aee77 (patch) | |
| tree | cfb88b98404ae690e31fcc8cb56c6130a551b94b /mandoline/app | |
| parent | 99a5cdb9efe533ea7e086c749062e53a0a54f829 (diff) | |
| download | chromium_src-411de5c8ce7feaeb3f1d56881a0ea1db7a9aee77.zip chromium_src-411de5c8ce7feaeb3f1d56881a0ea1db7a9aee77.tar.gz chromium_src-411de5c8ce7feaeb3f1d56881a0ea1db7a9aee77.tar.bz2 | |
Revert of mandoline: Sandbox mojo:browser and mojo:omnibox. (patchset #2 id:20001 of https://codereview.chromium.org/1282903002/ )
Reason for revert:
This broke --enable-multiprocess on mandoline.
Original issue's description:
> mandoline: Sandbox mojo:browser and mojo:omnibox.
>
> BUG=492524
>
> Committed: https://crrev.com/7cd4b784ffd31856b32ada4efd2265a4989fd575
> Cr-Commit-Position: refs/heads/master@{#342725}
TBR=jam@chromium.org,erg@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=492524
Review URL: https://codereview.chromium.org/1274993003
Cr-Commit-Position: refs/heads/master@{#342822}
Diffstat (limited to 'mandoline/app')
| -rw-r--r-- | mandoline/app/core_services_initialization.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mandoline/app/core_services_initialization.cc b/mandoline/app/core_services_initialization.cc index a11fb63..7f1dd12 100644 --- a/mandoline/app/core_services_initialization.cc +++ b/mandoline/app/core_services_initialization.cc @@ -13,7 +13,7 @@ void InitCoreServicesForContext(mojo::runner::Context* context) { // autogenerated from package manifests. mojo::shell::ApplicationManager* manager = context->application_manager(); manager->RegisterApplicationPackageAlias( - GURL("mojo:clipboard"), GURL("mojo:core_services"), "Core"); + GURL("mojo:clipboard"), GURL("mojo:core_services"), "Sandboxed Core"); manager->RegisterApplicationPackageAlias(GURL("mojo:filesystem"), GURL("mojo:core_services"), "Files"); #if defined(OS_LINUX) && !defined(OS_ANDROID) @@ -28,7 +28,7 @@ void InitCoreServicesForContext(mojo::runner::Context* context) { manager->RegisterApplicationPackageAlias( GURL("mojo:network_service"), GURL("mojo:core_services"), "Network"); manager->RegisterApplicationPackageAlias( - GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Files"); + GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Core"); #endif #if defined(USE_AURA) @@ -38,10 +38,9 @@ void InitCoreServicesForContext(mojo::runner::Context* context) { manager->RegisterApplicationPackageAlias( GURL("mojo:surfaces_service"), GURL("mojo:core_services"), "Surfaces"); manager->RegisterApplicationPackageAlias( - GURL("mojo:tracing"), GURL("mojo:core_services"), "Core"); + GURL("mojo:tracing"), GURL("mojo:core_services"), "Sandboxed Core"); manager->RegisterApplicationPackageAlias(GURL("mojo:browser"), - GURL("mojo:core_services"), - "Core"); + GURL("mojo:core_services"), "Core"); } } // namespace mandoline |