Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Side by Side Diff: mandoline/app/core_services_initialization.cc

Issue 1276163002: Revert of Sandbox html_viewer on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/html_viewer/html_viewer_main.cc ('k') | mandoline/services/core_services/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/runner/context.h" 7 #include "mojo/runner/context.h"
8 8
9 namespace mandoline { 9 namespace mandoline {
10 10
11 void InitCoreServicesForContext(mojo::runner::Context* context) { 11 void InitCoreServicesForContext(mojo::runner::Context* context) {
12 // TODO(erg): We should probably handle this differently; these could be 12 // TODO(erg): We should probably handle this differently; these could be
13 // autogenerated from package manifests. 13 // autogenerated from package manifests.
14 mojo::shell::ApplicationManager* manager = context->application_manager(); 14 mojo::shell::ApplicationManager* manager = context->application_manager();
15 manager->RegisterApplicationPackageAlias( 15 manager->RegisterApplicationPackageAlias(
16 GURL("mojo:clipboard"), GURL("mojo:core_services"), "Sandboxed Core"); 16 GURL("mojo:clipboard"), GURL("mojo:core_services"), "Sandboxed Core");
17 manager->RegisterApplicationPackageAlias(GURL("mojo:filesystem"), 17 manager->RegisterApplicationPackageAlias(GURL("mojo:filesystem"),
18 GURL("mojo:core_services"), "Files"); 18 GURL("mojo:core_services"), "Files");
19 #if defined(OS_LINUX) && !defined(OS_ANDROID)
20 manager->RegisterApplicationPackageAlias(GURL("mojo:font_service"),
21 GURL("mojo:core_services"), "Files");
22 #endif
23 #if !defined(OS_ANDROID) 19 #if !defined(OS_ANDROID)
24 // On Android, these are Java apps which are loaded in the shell process. 20 // On Android, these are Java apps which are loaded in the shell process.
25 manager->RegisterApplicationPackageAlias(GURL("mojo:view_manager"), 21 manager->RegisterApplicationPackageAlias(GURL("mojo:view_manager"),
26 GURL("mojo:core_services"), 22 GURL("mojo:core_services"),
27 "Surfaces"); 23 "Surfaces");
28 manager->RegisterApplicationPackageAlias( 24 manager->RegisterApplicationPackageAlias(
29 GURL("mojo:network_service"), GURL("mojo:core_services"), "Network"); 25 GURL("mojo:network_service"), GURL("mojo:core_services"), "Network");
30 manager->RegisterApplicationPackageAlias( 26 manager->RegisterApplicationPackageAlias(
31 GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Core"); 27 GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Core");
32 #endif 28 #endif
33 29
34 #if defined(USE_AURA) 30 #if defined(USE_AURA)
35 manager->RegisterApplicationPackageAlias( 31 manager->RegisterApplicationPackageAlias(
36 GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core"); 32 GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core");
37 #endif 33 #endif
38 manager->RegisterApplicationPackageAlias( 34 manager->RegisterApplicationPackageAlias(
39 GURL("mojo:surfaces_service"), GURL("mojo:core_services"), "Surfaces"); 35 GURL("mojo:surfaces_service"), GURL("mojo:core_services"), "Surfaces");
40 manager->RegisterApplicationPackageAlias( 36 manager->RegisterApplicationPackageAlias(
41 GURL("mojo:tracing"), GURL("mojo:core_services"), "Sandboxed Core"); 37 GURL("mojo:tracing"), GURL("mojo:core_services"), "Sandboxed Core");
42 manager->RegisterApplicationPackageAlias(GURL("mojo:browser"), 38 manager->RegisterApplicationPackageAlias(GURL("mojo:browser"),
43 GURL("mojo:core_services"), "Core"); 39 GURL("mojo:core_services"), "Core");
44 } 40 }
45 41
46 } // namespace mandoline 42 } // namespace mandoline
OLDNEW
« no previous file with comments | « components/html_viewer/html_viewer_main.cc ('k') | mandoline/services/core_services/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698