content/content_common.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_common.gypi

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

Patch Set: Added some missing docs and removed some cruft 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

« content/browser/mojo_shell_context_impl.cc ('K') | « content/content_browser.gypi ('k') | content/content_common_mojo_bindings.gyp » ('j') | content/public/browser/mojo_app_connection.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_common.gypi

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

index 55930974c8ca617395c99819f8583f0badae4169..e9c3399ebbaf7431c1fcce65757cee1b4f509b81 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -7,9 +7,14 @@

'../base/base.gyp:base',

'../components/tracing.gyp:tracing',

'../gpu/command_buffer/command_buffer.gyp:gles2_utils',

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

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

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

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

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

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

'../third_party/WebKit/public/blink_headers.gyp:blink_headers',

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

'../third_party/icu/icu.gyp:icuuc',

'../ui/accessibility/accessibility.gyp:accessibility',

'../ui/base/ime/ui_base_ime.gyp:ui_base_ime',

@@ -36,6 +41,7 @@

'use_v4l2_codec%': 0,

'public_common_sources': [

'public/common/appcache_info.h',

+ 'public/common/application_registry.h',

'public/common/bindings_policy.h',

'public/common/child_process_host.h',

'public/common/child_process_host_delegate.cc',

@@ -135,6 +141,8 @@

'public/common/speech_recognition_result.h',

'public/common/ssl_status.cc',

'public/common/ssl_status.h',

+ 'public/common/static_mojo_application_loader.cc',

+ 'public/common/static_mojo_application_loader.h',

'public/common/stop_find_action.h',

'public/common/storage_quota_params.h',

'public/common/three_d_api_types.h',

« content/browser/mojo_shell_context_impl.cc ('K') | « content/content_browser.gypi ('k') | content/content_common_mojo_bindings.gyp » ('j') | content/public/browser/mojo_app_connection.h » ('J')