summaryrefslogtreecommitdiffstats
path: root/content/content_common.gypi
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2015-03-03 08:31:04 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-03 16:31:38 +0000
commitcbca72f3c9e31309a28b98624e1e0147c5dca7a1 (patch)
tree1bde2f531bed308832135e8d66a784afb0e258b1 /content/content_common.gypi
parent633e315de496ed52f2aed727ab36b23ea2fa3e87 (diff)
downloadchromium_src-cbca72f3c9e31309a28b98624e1e0147c5dca7a1.zip
chromium_src-cbca72f3c9e31309a28b98624e1e0147c5dca7a1.tar.gz
chromium_src-cbca72f3c9e31309a28b98624e1e0147c5dca7a1.tar.bz2
Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819
Highlights: - mojo::ChannelInit has been replaced with content::ChannelInit. - ScopedIPCSupport has been added so Mojo consumers can ensure the EDK is initialized. - single process mode now uses some evil tricks to get child threads to create their mojo client channels on the browser I/O thread. - several Android bits adapted to new interfaces - a number of tests have been adapted to work properly in spite of unconventional process arrangements BUG=None Review URL: https://codereview.chromium.org/954643002 Cr-Commit-Position: refs/heads/master@{#318883}
Diffstat (limited to 'content/content_common.gypi')
-rw-r--r--content/content_common.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index c62e10f..3a63205 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -416,6 +416,8 @@
'common/message_router.cc',
'common/message_router.h',
'common/mime_registry_messages.h',
+ 'common/mojo/channel_init.cc',
+ 'common/mojo/channel_init.h',
'common/mojo/mojo_messages.h',
'common/mojo/service_registry_impl.cc',
'common/mojo/service_registry_impl.h',