content/content_browser.gypi - Issue 1149833007: Embed a mojo ApplicationManager in content/browser

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

Unified Diff: content/content_browser.gypi

Issue 1149833007: Embed a mojo ApplicationManager in content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments

Download patch

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index b6c11b6687ed90a506f369821a21ec1088a673ab..76a3c5208f4a525f202656d4e54a838e6e2504a4 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -11,10 +11,17 @@

'../device/vibration/vibration.gyp:device_vibration',

'../device/vibration/vibration.gyp:device_vibration_mojo_bindings',

'../google_apis/google_apis.gyp:google_apis',

+ '../mojo/mojo_base.gyp:mojo_application_base',

+ '../mojo/mojo_base.gyp:mojo_application_bindings',

+ '../mojo/mojo_base.gyp:mojo_url_type_converters',

+ '../mojo/mojo_services.gyp:network_service_bindings_lib',

+ '../mojo/mojo_shell.gyp:mojo_shell_lib',

'../net/net.gyp:net',

'../net/net.gyp:net_extras',

'../skia/skia.gyp:skia',

'../sql/sql.gyp:sql',

+ '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',

+ '../third_party/mojo/mojo_public.gyp:mojo_cpp_system',

'../third_party/re2/re2.gyp:re2',

'../third_party/zlib/google/zip.gyp:zip',

'../third_party/zlib/zlib.gyp:zlib',

@@ -165,6 +172,8 @@

'public/browser/media_device_id.h',

'public/browser/message_port_delegate.h',

'public/browser/message_port_provider.h',

+ 'public/browser/mojo_app_connection.h',

+ 'public/browser/mojo_shell_context.h',

'public/browser/native_web_keyboard_event.h',

'public/browser/navigation_controller.cc',

'public/browser/navigation_controller.h',

@@ -1029,6 +1038,10 @@

'browser/mojo/service_registrar_android.h',

'browser/mojo/service_registry_android.cc',

'browser/mojo/service_registry_android.h',

+ 'browser/mojo_app_connection_impl.cc',

+ 'browser/mojo_app_connection_impl.h',

+ 'browser/mojo_shell_context_impl.cc',

+ 'browser/mojo_shell_context_impl.h',

'browser/navigator_connect/navigator_connect_context_impl.cc',

'browser/navigator_connect/navigator_connect_context_impl.h',

'browser/navigator_connect/navigator_connect_dispatcher_host.cc',

« content/browser/mojo_shell_browsertest.cc ('K') | « content/content.gyp ('k') | content/content_common.gypi » ('j') | content/public/utility/BUILD.gn » ('J')