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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_browser.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
« content/common/mojo/mojo_channel_init.cc ('K') | « content/common/mojo/mojo_messages.h ('k') | content/content_common.gypi » ('j') | content/content_renderer.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 0ca5776bc5b7d1620bc9eb97943ef259df21fe3e..3f82cb797638ee4f63a2abd8bd539d1cf68029a0 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1358,6 +1358,12 @@
'browser/gamepad/gamepad_platform_data_fetcher.cc',
]
}],
+ # TODO(sky): conditional temporary until mojo is sorted out on mac.
+ ['OS=="win" or OS=="linux" or OS=="android"', {
+ 'dependencies': [
+ '../mojo/mojo.gyp:mojo_system',
+ ],
+ }],
['OS=="ios"', {
'sources/': [
# iOS only needs a small portion of content; exclude all the
« content/common/mojo/mojo_channel_init.cc ('K') | « content/common/mojo/mojo_messages.h ('k') | content/content_common.gypi » ('j') | content/content_renderer.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698