mandoline/app/core_services_initialization.cc - Issue 1245683004: Mandoline: Merge Surfaces and Views apps

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Remove context_provider.mojom 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

« components/view_manager/view_manager_app.cc ('K') | « components/view_manager/view_manager_service_unittest.cc ('k') | mandoline/services/core_services/BUILD.gn » ('j') | mandoline/services/core_services/core_services_application_delegate.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/runner/context.h"	7 #include "mojo/runner/context.h"

8	8

9 namespace mandoline {	9 namespace mandoline {

10	10

(...skipping 14 matching lines...) Expand all Loading...
25 GURL("mojo:network_service"), GURL("mojo:core_services"), "Network");	25 GURL("mojo:network_service"), GURL("mojo:core_services"), "Network");

26 manager->RegisterApplicationPackageAlias(	26 manager->RegisterApplicationPackageAlias(

27 GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Core");	27 GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Core");

28 #endif	28 #endif

29	29

30 #if defined(USE_AURA)	30 #if defined(USE_AURA)

31 manager->RegisterApplicationPackageAlias(	31 manager->RegisterApplicationPackageAlias(

32 GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core");	32 GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core");

33 #endif	33 #endif

34 manager->RegisterApplicationPackageAlias(	34 manager->RegisterApplicationPackageAlias(

35 GURL("mojo:surfaces_service"), GURL("mojo:core_services"), "Surfaces");

36 manager->RegisterApplicationPackageAlias(

37 GURL("mojo:tracing"), GURL("mojo:core_services"), "Sandboxed Core");	35 GURL("mojo:tracing"), GURL("mojo:core_services"), "Sandboxed Core");

38 manager->RegisterApplicationPackageAlias(GURL("mojo:browser"),	36 manager->RegisterApplicationPackageAlias(GURL("mojo:browser"),

39 GURL("mojo:core_services"), "Core");	37 GURL("mojo:core_services"), "Core");

40 }	38 }

41	39

42 } // namespace mandoline	40 } // namespace mandoline

OLD	NEW