summaryrefslogtreecommitdiff
path: root/chromium/ipc/ipc_channel.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-08-01 12:59:39 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-04 12:40:43 +0000
commit28b1110370900897ab652cb420c371fab8857ad4 (patch)
tree41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/ipc/ipc_channel.h
parent399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff)
downloadqtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions. Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ipc/ipc_channel.h')
-rw-r--r--chromium/ipc/ipc_channel.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/chromium/ipc/ipc_channel.h b/chromium/ipc/ipc_channel.h
index fdd0b352964..09baf6cf140 100644
--- a/chromium/ipc/ipc_channel.h
+++ b/chromium/ipc/ipc_channel.h
@@ -223,6 +223,17 @@ class IPC_EXPORT Channel : public Endpoint {
static std::string GenerateVerifiedChannelID(const std::string& prefix);
#endif
+ // Generates a pair of channel handles that can be used as the client and
+ // server ends of a ChannelMojo. |name_postfix| is appended to the end of the
+ // handle name to help identify the handles.
+ //
+ // Note, when using ChannelMojo, |ChannelHandle::name| serves no functional
+ // purpose other than to identify the channel in logging.
+ static void GenerateMojoChannelHandlePair(
+ const std::string& name_postfix,
+ IPC::ChannelHandle* handle0,
+ IPC::ChannelHandle* handle1);
+
#if defined(OS_LINUX)
// Sandboxed processes live in a PID namespace, so when sending the IPC hello
// message from client to server we need to send the PID from the global