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

Unified Diff: content/content_common.gypi

Issue 195993010: Adds the ability for the renderer to create the mojo channel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to trunk and update ifdefs 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 8e46bb5b3c4be2c59489cf8bb1f8fe723eb2c2df..9c77a08ceb255c842e941f4ac015fda7072bfc90 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -324,6 +324,9 @@
'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',
@@ -479,6 +482,19 @@
'content.gyp:webkit_version',
],
}],
+ # TODO(sky): conditional temporary until mojo is sorted out on mac.
+ ['OS=="mac"', {
+ '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',

Powered by Google App Engine
This is Rietveld 408576698