summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authormorrita <morrita@chromium.org>2014-11-19 17:08:35 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-20 01:09:52 +0000
commit45d3cbd888ea1f20145e0f1451a7920a62a6653d (patch)
tree9e683c46b9a2254ab2d6728a88f6c4067d3e30a0 /ipc
parentc87149e666acfe39d49d7f30a5fd9acc7ef085ea (diff)
downloadchromium_src-45d3cbd888ea1f20145e0f1451a7920a62a6653d.zip
chromium_src-45d3cbd888ea1f20145e0f1451a7920a62a6653d.tar.gz
chromium_src-45d3cbd888ea1f20145e0f1451a7920a62a6653d.tar.bz2
Turn ChannelMojo on Mac and Linux
I don't see any page_cycler regression locally so I'll try to enable this on trunk as the nex step. This change doesn't turn this on Windows to keep the scope of possible trouble small. BUG=377980 R=viettrungluu@chromium.org, darin@chromium.org Review URL: https://codereview.chromium.org/664413003 Cr-Commit-Position: refs/heads/master@{#304949}
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mojo/ipc_channel_mojo.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc
index 36e5bae..66f232d 100644
--- a/ipc/mojo/ipc_channel_mojo.cc
+++ b/ipc/mojo/ipc_channel_mojo.cc
@@ -175,8 +175,15 @@ void ChannelMojo::ChannelInfoDeleter::operator()(
// static
bool ChannelMojo::ShouldBeUsed() {
- // TODO(morrita): Turn this on for a set of platforms.
+ // Being conservative, this is currently enabled only on Mac and
+ // Linux even though this should work on all platforms.
+ // TODO(morrita): Turn this on all platform and kill
+ // --enable-renderer-mojo-channel
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
+ return true;
+#else
return false;
+#endif
}
// static