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

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

Issue 1245683004: Mandoline: Merge Surfaces and Views apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed bot issues (I hope) 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
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
(...skipping 20 matching lines...) Expand all
31 GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Files"); 31 GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Files");
32 #endif 32 #endif
33 33
34 #if defined(USE_AURA) 34 #if defined(USE_AURA)
35 manager->RegisterApplicationPackageAlias( 35 manager->RegisterApplicationPackageAlias(
36 GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core"); 36 GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core");
37 #endif 37 #endif
38 manager->RegisterApplicationPackageAlias( 38 manager->RegisterApplicationPackageAlias(
39 GURL("mojo:web_view"), GURL("mojo:core_services"), "Core"); 39 GURL("mojo:web_view"), GURL("mojo:core_services"), "Core");
40 manager->RegisterApplicationPackageAlias( 40 manager->RegisterApplicationPackageAlias(
41 GURL("mojo:surfaces_service"), GURL("mojo:core_services"), "Surfaces");
42 manager->RegisterApplicationPackageAlias(
43 GURL("mojo:tracing"), GURL("mojo:core_services"), "Core"); 41 GURL("mojo:tracing"), GURL("mojo:core_services"), "Core");
44 manager->RegisterApplicationPackageAlias(GURL("mojo:browser"), 42 manager->RegisterApplicationPackageAlias(GURL("mojo:browser"),
45 GURL("mojo:core_services"), 43 GURL("mojo:core_services"),
46 "Core"); 44 "Core");
47 } 45 }
48 46
49 } // namespace mandoline 47 } // namespace mandoline
OLDNEW
« no previous file with comments | « components/view_manager/view_manager_service_unittest.cc ('k') | mandoline/services/core_services/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698