| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mandoline/app/core_services_initialization.h" | 5 #include "mandoline/app/core_services_initialization.h" |
| 6 | 6 |
| 7 #include "mojo/package_manager/package_manager_impl.h" |
| 7 #include "mojo/runner/context.h" | 8 #include "mojo/runner/context.h" |
| 8 | 9 |
| 9 namespace mandoline { | 10 namespace mandoline { |
| 10 | 11 |
| 11 void InitCoreServicesForContext(mojo::runner::Context* context) { | 12 void InitCoreServicesForContext(mojo::runner::Context* context) { |
| 12 // TODO(erg): We should probably handle this differently; these could be | 13 // TODO(erg): We should probably handle this differently; these could be |
| 13 // autogenerated from package manifests. | 14 // autogenerated from package manifests. |
| 14 mojo::shell::ApplicationManager* manager = context->application_manager(); | 15 mojo::package_manager::PackageManagerImpl* manager = |
| 16 context->package_manager(); |
| 15 manager->RegisterApplicationPackageAlias( | 17 manager->RegisterApplicationPackageAlias( |
| 16 GURL("mojo:clipboard"), GURL("mojo:core_services"), "Core"); | 18 GURL("mojo:clipboard"), GURL("mojo:core_services"), "Core"); |
| 17 manager->RegisterApplicationPackageAlias(GURL("mojo:filesystem"), | 19 manager->RegisterApplicationPackageAlias(GURL("mojo:filesystem"), |
| 18 GURL("mojo:core_services"), "Files"); | 20 GURL("mojo:core_services"), "Files"); |
| 19 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 21 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
| 20 manager->RegisterApplicationPackageAlias(GURL("mojo:font_service"), | 22 manager->RegisterApplicationPackageAlias(GURL("mojo:font_service"), |
| 21 GURL("mojo:core_services"), "Files"); | 23 GURL("mojo:core_services"), "Files"); |
| 22 #endif | 24 #endif |
| 23 #if !defined(OS_ANDROID) | 25 #if !defined(OS_ANDROID) |
| 24 // On Android, these are Java apps which are loaded in the shell process. | 26 // On Android, these are Java apps which are loaded in the shell process. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 38 manager->RegisterApplicationPackageAlias( | 40 manager->RegisterApplicationPackageAlias( |
| 39 GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core"); | 41 GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core"); |
| 40 #endif | 42 #endif |
| 41 manager->RegisterApplicationPackageAlias( | 43 manager->RegisterApplicationPackageAlias( |
| 42 GURL("mojo:web_view"), GURL("mojo:core_services"), "Core"); | 44 GURL("mojo:web_view"), GURL("mojo:core_services"), "Core"); |
| 43 manager->RegisterApplicationPackageAlias( | 45 manager->RegisterApplicationPackageAlias( |
| 44 GURL("mojo:tracing"), GURL("mojo:core_services"), "Core"); | 46 GURL("mojo:tracing"), GURL("mojo:core_services"), "Core"); |
| 45 } | 47 } |
| 46 | 48 |
| 47 } // namespace mandoline | 49 } // namespace mandoline |
| OLD | NEW |