content/content_common.gypi - Issue 201283002: Revert of Adds the ability for the renderer to create the mojo channel

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 201283002: Revert of Adds the ability for the renderer to create the mojo channel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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_common.gypi

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

index 840e8308e143663c9248cbb1f92177caaab212bc..8e46bb5b3c4be2c59489cf8bb1f8fe723eb2c2df 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -324,9 +324,6 @@

'common/message_router.cc',

'common/message_router.h',

'common/mime_registry_messages.h',

- 'common/mojo/mojo_channel_init.cc',

- 'common/mojo/mojo_channel_init.h',

- 'common/mojo/mojo_messages.h',

'common/navigation_gesture.h',

'common/net/url_fetcher.cc',

'common/net/url_request_user_data.cc',

@@ -482,19 +479,6 @@

'content.gyp:webkit_version',

}],

- # TODO(sky): conditional temporary until mojo is sorted out on mac.

- ['OS=="mac" or OS=="ios"', {

- 'sources!': [

- 'common/mojo/mojo_channel_init.cc',

- 'common/mojo/mojo_channel_init.h',

- ],

- }, {

- 'dependencies': [

- '../mojo/mojo.gyp:mojo_environment_chromium',

- '../mojo/mojo.gyp:mojo_system',

- '../mojo/mojo.gyp:mojo_system_impl',

- ],

- }],

['OS=="mac"', {

'sources': [

'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',

« no previous file with comments | « content/content_browser.gypi ('k') | content/content_renderer.gypi » ('j') | no next file with comments »